add db config (commented out) to avoid issues with free service tiers
Merge branch 'master' into auto-reconfiguration-test

Conflicts:
	play-application/conf/application.conf