Sdz Symfony2 Formulaire Ok
Merge branch 'master' of https://github.com/Namiro/BelTest

Conflicts:
	app/Resources/views/layout.html.twig
	composer.json
	composer.lock
	src/BelTest/BlogBundle/Controller/BlogController.php
	src/BelTest/BlogBundle/Entity/Article.php
	src/BelTest/BlogBundle/Entity/Article.php~
	src/BelTest/BlogBundle/Entity/ArticleRepository.php
	src/BelTest/BlogBundle/Entity/Image.php
	src/BelTest/BlogBundle/Resources/views/Blog/formulaire.html.twig
	src/BelTest/BlogBundle/Resources/views/Blog/index.html.twig
	src/BelTest/BlogBundle/Resources/views/Blog/supprimer.html.twig
	src/BelTest/BlogBundle/Resources/views/Blog/voir.html.twig