Various
Merge branch 'master' of https://github.com/chte/SolarSense

Conflicts:
	src/SceneSolarSystem/Camera.cpp
Version for now