Add an (empty) config file
Fill and set the config file with variables
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
Merge pull request #47 from projectcs13/develop

Develop