Slug
Merge branch '1.0/develop' of https://github.com/krek-dev/ArticleBundle into 1.0/develop

Conflicts:
	Entity/Article.php
	Resources/config/doctrine/Article.orm.yml
	Resources/views/Article/list.html.twig
Slug - 2