Resolved conflicts.
Merge branch 'master' of github.com:ukwa/w3act

Conflicts:
	conf/application.conf