Added the map-in-between (updates #92)
Merge pull request #137 from ZeusWPI/android/map-activity-location

Added the map-in-between (updates #92)
Hooray for usability
Moar usability (updates #100)
Fixes (updates #100)
Added forgotten xml (updates #100)
Merge branch 'master' into ios/ios-7

* master:
  Added forgotten xml (updates #100)
  Fixes (updates #100)
  Moar usability (updates #100)
  Hooray for usability
  Added the map-in-between (updates #92)
Use mask for pagecontrol images