Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into feature-weather

Conflicts:
	Android/build.gradle
	Android/src/org/droidplanner/android/DroidPlannerApp.java
	Android/src/org/droidplanner/android/notifications/NotificationHandler.java
	Android/src/org/droidplanner/android/notifications/PebbleNotificationProvider.java
	Android/src/org/droidplanner/android/notifications/StatusBarNotificationProvider.java
	Android/src/org/droidplanner/android/notifications/TTSNotificationProvider.java