Many thing
Many thing
Merge branch 'master' of https://github.com/Ajirass/YourBooks

Conflicts:
	src/YourBooks/BookBundle/Admin/BookAdmin.php
	src/YourBooks/BookBundle/Entity/BookRepository.php
	src/YourBooks/MainBundle/Controller/EditorController.php
	src/YourBooks/MainBundle/Controller/ReaderController.php
	src/YourBooks/MainBundle/Resources/public/css/normalize.css
	src/YourBooks/MainBundle/Resources/public/js/jquery.min.js
	src/YourBooks/MainBundle/Resources/public/js/modernizr.min.js