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