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

Conflicts:
	app/controllers/streams_controller.rb
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation

Conflicts:
	app/controllers/streams_controller.rb
clean up working when changeing resource suggestion with selected streams.
Merge branch 'sp7.sc1.smartCreation' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Cleanup done when leaving the page in the middle of stream creation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Populate forms with Streams data
Finish and improve the smart creation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Creation of multiple streams works!
Improve smart creation and fix navigation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Fix stream's user_id
Merge pull request #136 from projectcs13/sp7.sc1.smartCreation

Sp7.sc1.smart creation