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

Conflicts:
	Android/src/org/droidplanner/android/fragments/SettingsFragment.java
	Android/src/org/droidplanner/android/services/UploaderService.java
	Android/src/org/droidplanner/android/utils/prefs/DroidPlannerPrefs.java