Setup for Heroku
Merge branch 'master' of github.com:CasperNik/RefCMS

Conflicts:
	config/database.yml

	modified:   config/database.yml