sachen die ich noch nicht commited hab
Merge branch 'develop' of github.com:jack10/de.htwg.seapal.android into develop

Conflicts:
	SeapalAndroidApp/res/values/strings.xml
	SeapalAndroidApp/src/de/htwg/seapal/aview/gui/activity/MapActivity.java