add c++11
Merge branch 'master' of github.com:scheckmedia/CameraControllerApi

Conflicts:
	CameraControllerApi/Makefile