änderungen rückgängig gemacht
Merge branch 'master' of https://github.com/avionik/AirSwimmer

Conflicts:
	OberflÃ¤che/src/AirSwimmer/src/de/airswimmer/gui/Movement.java