init commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/AppKernel.php
	app/config/config.yml
init commit