Merge pull request #45 from projectcs13/develop

Develop
Change URLs for Production ENV
Merge pull request #46 from projectcs13/develop

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

Conflicts:
	app/controllers/resources_controller.rb
	app/controllers/search_controller.rb
	app/controllers/streams_controller.rb