Update
Update
Merge branch 'master' of https://github.com/isflorin/filmego

Conflicts:
	src/Filmego/AdminBundle/DataFixtures/ORM/LoadCategoryData.php