camera fix
Merge branch 'develop' of https://github.com/ggj/ggj13 into develop

Conflicts:
	resources/scenes/game.scene