Fixing config.yml
Merge branch 'lord_baine' into develop

Conflicts:
	app/config/config.yml