map display basic with zoom and search
Merge so that we can push

Merge branch 'create-controllers' of https://github.com/bobolinks-2014/trek_tracker into create-controllers