map + controller
Merge branch 'master' of https://github.com/gansky-alexander/MapBundle