Prepare for push to heroku
Cleaned up main-map-service marker code.
Merge branch 'development'
Preparing to push to heroku.
Merge branch 'master' of https://github.com/licyeus/deglassified