continued updates
Merge branch 'NewUI' of https://github.com/jason4short/droidplanner.git into NewUI