Merge pull request #47 from projectcs13/develop

Develop
Add production API URL
Merge branch 'master' of heroku.com:lit-caverns-3776

Conflicts:
	config/config.yml
Merge branch 'master' of github.com:projectcs13/sensor-cloud-website

Conflicts:
	config/config.yml