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

Conflicts:
	Android/res/xml/preferences.xml