Use default application.conf again.
Merge branch 'master' of https://github.com/stheophil/wahlversprechen

Conflicts:
	conf/application.conf