updated
Merge remote-tracking branch 'origin/1.0-develop' into 1.0

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	app/config/security.yml
	composer.json
	composer.lock