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