Populate map with state markers
Merge branch 'develop' of https://github.com/OpenGea/gea into feature/android-markers
Merge branch 'develop' of github.com:OpenGea/gea into feature/mapfilter
Merge branch 'develop' of https://github.com/kcho47/gea into feature/mapfilter
Merge branch 'develop' of https://github.com/kcho47/gea into feature/mapfilter
Added Rdio Logo. Added tour stop for map pins.
Merge branch 'feature/mapfilter' into develop

Conflicts:
	web/assets/styl/main.styl
	web/public/index.html
Merge branch 'develop' of https://github.com/kcho47/gea into develop
Fixed search results display.
Data structure to map markers to top tracks for location
Merge branch 'develop' of github.com:OpenGea/gea into develop

Conflicts:
	web/assets/styl/main.styl
	web/public/js/app/views/widgets/SearchResult.html
	web/public/js/app/views/widgets/SearchResult.js
Click on marker shows top tracks list dialog
Merge branch 'develop' of https://github.com/kcho47/gea into develop
Merge pull request #122 from kcho47/develop

ALL the Map Features!
Selecting top tracks result plays it and loads playlist
Merge branch 'feature/android-markers' into develop
Merge pull request #123 from gdaolewe/develop

Implemented markers w/ top tracks
Removed old code.
Added details to tour stop for map. Fixed another tour stop.
Merge branch 'develop' of github.com:OpenGea/gea into develop