Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation

Conflicts:
	app/controllers/streams_controller.rb
Fix the information on each step in the New Stream window
Merge pull request #130 from projectcs13/sp7.sc1.smartCreation

Sp7.sc1.smart creation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.fix_single_stream_creation
Merge pull request #131 from projectcs13/sp7.sc1.fix_single_stream_creation

Sp7.sc1.fix single stream creation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation

Conflicts:
	app/controllers/streams_controller.rb