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
Implement the Relationship model
Add a 'followed streams' page
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc2.phrase_suggestion
Add follow/unfollow buttons
added search autocompletion
Add option to specify which javascript to load depending on controller-action
Fix #93
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
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
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
Fix a bug in 'My streams' view (other people's streams were also displayed)
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop