simplify cmake
Merge branch 'master' into ws1314_1

Conflicts:
	source/CMakeLists.txt