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
fixed map bug
fixed
Merge pull request #133 from projectcs13/sp7.sc2.user_profile

Sp7.sc2.user profile
Merge pull request #134 from projectcs13/sp7.sc3.bugfix

Sp7.sc3.bugfix
add trigger div
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc3.triggers_on_owned_streams
added localhost environment to start use: rails s -e localhost
reset show.html.erb to develop version
Merge pull request #135 from projectcs13/sp7.sc3.localhost_environment

Sp7.sc3.localhost environment
Finish and improve the smart creation
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Partially fix tests
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop