Merge branch 'develop' of github.com:kapla/scrumbag into develop

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	composer.json
	composer.lock
Merge branch 'develop' of github.com:kapla/scrumbag into develop

Conflicts:
	app/AppKernel.php