Merge
Merge branch 'master' of https://github.com/gundermann/flexplan.git

Conflicts:
	felxplan_android/AndroidManifest.xml
	felxplan_android/bin/AndroidManifest.xml
	felxplan_android/res/values/strings.xml
	felxplan_android/src/com/felxplan/AbstractActivity.java
	felxplan_android/src/com/felxplan/BreakSetupActivity.java
	felxplan_android/src/com/felxplan/BreakViewActivity.java
	felxplan_android/src/com/felxplan/FlextimeDaySetupActivity.java