epic fix pack 4
Merge branch 'master' of github.com:gyzerok/Cron

Conflicts:
	src/Cron/CronBundle/Resources/views/Main/category.html.twig