application.conf
Merge branch 'mix' of https://github.com/HCI-webdesigner/Dean into mix
application.conf
Conflicts:
	conf/application.conf