SPS
Merge branch 'master' of https://github.com/Kolkina/Fagprojekt

Conflicts:
	Cameras/SubPointSystem.h