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

Conflicts:
	composer.lock
	src/Application/Sonata/UserBundle/Resources/config/doctrine/User.orm.xml
	src/YourBooks/MainBundle/Controller/EditorController.php
Add some email