Merge pull request #86 from projectcs13/developSilverBullet

Develop silver bullet
Both stars and percentage for user ranking, easy to remove either one
Both stars and percentage for user ranking, easy to remove either one
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Merge pull request #89 from projectcs13/Sp7.Sc1.UserRanking

Sp7.sc1.user ranking
Fix create/edit streams with null values
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
Update show.html.erb
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