TreeMap must be typed

remove error when building with 1.6 compliance
Merge pull request #1305 from treymarc/patch-1

TreeMap must be typed
Merge branches 'dp3' and 'master' of https://github.com/DroidPlanner/droidplanner into dp3