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

Conflicts:
	app/controllers/searches_controller.rb