Little refactor in streams file
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop

Conflicts:
	app/assets/javascripts/streams.js.coffee