added map options
Merge branch 'master' of https://github.com/bestehle/SeapalAndroidApp

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