Merge remote-tracking branch 'origin/5.0'

Authored by kfunk on Aug 29 2016, 8:13 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
1e1a5eb66afebrauch
remove unused file from CMakeLists.txt as well ;) 
Aug 28 2016
ca894e943796brauch
Remove unused file 
Aug 28 2016
f100464ab513pino
fixuifiles 
Aug 27 2016