Camera bugs fixed.
Merge remote-tracking branch 'origin/develop-miniproject' into develop-miniproject

Conflicts:
	src/main/resources/default.config