fixes #5
Merge branch 'master' of https://github.com/opentrack/opentrack.git

Conflicts:
	CMakeLists.txt