Merge branch 'master' of github.com:appforma/previewer

Conflicts:
	config/database.yml
Merge branch 'master' of github.com:appforma/previewer

Conflicts:
	config/database.yml