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