Merge branch 'master' into feature-weather

Conflicts:
	Android/res/values/strings.xml
	Android/src/org/droidplanner/android/DroidPlannerApp.java