22.06.14 19:52
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/de/maka/vertretungsplanapp/SettingsActivity.java