aaa
aaaMerge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index.scala.html
	app/views/kostenplan/createForm.scala.html
	conf/application.conf
	project/Build.scala
dvmanager-client integration
aaa