Merge with develop and fix conflicts
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc2.user_profile

Conflicts:
	app/assets/stylesheets/custom.css.scss