Fix conflicts with my stashed files
Merge branch 'sp7.sc1.suggestResource' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.suggestResource
Selection of streams still not working