Merge pull request #19 from abouthillier/ChrisFork

Chris fork
Merge pull request #20 from abouthillier/ChrisFork

Chris fork
Merge pull request #21 from abouthillier/ChrisFork

MapActivity comments
Vectorized the buttons, adjusted login page, adjusted map fragment xml
to be friendly to small resolutions, added new login background for
landscape mode
Merge pull request #24 from ggodone-maresca/master

Vectorized the buttons, adjusted login page, etc...
Merge pull request #25 from abouthillier/GerardsBranch

Gerards branch
Merge pull request #26 from abouthillier/master

Sync with master