..
correct CMakeLists
First Result
for merge
Merge branch 'master' into waves
Merge 2
Merge branch 'master' into waves
Merge branch 'master' into waves
Merge branch 'master' into waves
Merge branch 'waves'

Conflicts:
	CMakeLists.txt