Small hotfixes
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
Merge pull request #94 from projectcs13/developSilverBullet

Develop silver bullet
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop

Conflicts:
	app/controllers/searches_controller.rb
fixed map visualisation of streams during a search
Fix #90
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
Merge pull request #95 from projectcs13/sp7.sc3.map_visuals_search

fixed map visualisation of streams during a search
Add option to specify which javascript to load depending on controller-action
added map on create stream
fixed map on create stream and info on markers in the search view
Merge pull request #96 from projectcs13/sp7.sc3.update_javascript_asset

Add option to specify which javascript to load depending on controller-a...
Merge branch 'sp7.sc3.map_visuals_search' of github.com:projectcs13/sensor-cloud-website into sp7.sc3.map_visuals_search

Conflicts:
	app/assets/javascripts/streams.js.coffee
Fix the wrong edition
Merge pull request #97 from projectcs13/sp7.sc3.map_visuals_search

Sp7.sc3.map visuals search
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc2.phrase_suggestion