Removed shader folder from CMakeLists.txt
Merge branch 'master' into nonQtEvents