Merge branch 'feature_android_lib' of https://github.com/ne0fhyk/droidplanner into feature_android_wear

Conflicts:
	Android/src/org/droidplanner/android/notifications/NotificationHandler.java