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.
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
Merge branch 'develop' of https://github.com/kcho47/gea into develop
Removed old code.
Added details to tour stop for map. Fixed another tour stop.
Merge branch 'develop' of github.com:OpenGea/gea into develop
Merge pull request #124 from pheonix7117/develop

Added logo, added tour stop.