Scaling fix 4
Merge branch 'development' of https://github.com/DigohD/SE-Android into development

Conflicts:
	src/com/spaceshooter/game/view/GameView.java