Fixed formatting of some cmake files
Fixed function signature
Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master

Conflicts:
	testing/CMakeLists.txt