config
Merge branch 'master' of https://github.com/anicetog/coffice

Conflicts:
	config/application.yml