Tourdates
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ch/djsimeon/android/promoapplication/app/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
Tourdates menü