Slight change to cmake file
Merge branch 'master' of https://github.com/Barobo/RoboMancer

Conflicts:
	libbarobo
Fixed mac build files