Merge branch 'master' of https://github.com/DroidPlanner/droidplanner into feature_android_wear

Conflicts:
	Android/AndroidManifest.xml
	Android/src/org/droidplanner/android/DroidPlannerApp.java
	Android/src/org/droidplanner/android/receivers/NetworkStateReceiver.java