kleiner Fix
Merge branch 'master' of https://github.com/ubemy/MA.git

Conflicts:
	src/com/ma/schiffeversenken/CameraController.java