Abstract map controller functionality to common controller
Shoo, trailing whitespace, shoo
Merge branch 'master' of github.com:ZeusWPI/hydra
Merged master into android/association-filter