Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map
Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map_query
fixed map filtering query
Merge pull request #87 from projectcs13/sp6.sc3.filter_map_query

Sp6.sc3.filter map query
Move filtered search to another page
Merge branch 'sp7.sc3.advanced_search' into developSilverBullet
Fix the slider in filtered search
Small hotfixes
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc2.phrase_suggestion
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
added search autocompletion
Add option to specify which javascript to load depending on controller-action
Fix #93
added map on create stream