Abstract map controller functionality to common controller
Shoo, trailing whitespace, shoo
Merge branch 'master' of github.com:ZeusWPI/hydra
Merge branch 'master' into android/search-suggestions
More whitespace fixes