Creation of omit branch
Integrated integration with no dependencies on factory part
Merge remote-tracking branch 'origin/master' into integration-omit

Conflicts:
	app/Global.scala
	conf/logger.xml
asdsad