task-992-invoice
task-1031
controlling_oper
no_avatar
task-1001
task-1001
task-1001
task-1001
Merge branch 'task-1001' into staging

Conflicts:
	app/AppKernel.php
Merge remote-tracking branch 'origin/staging'