Fully implements maps
Merge branch 'master' of github.com:mitchellw/VTHacks-Android
Fixes MapFragment problems