merge
Merge branch 'master' of github.com:gyzerok/Cron

Conflicts:
	app/Resources/views/base.html.twig
	src/Cron/CronBundle/Controller/AjaxController.php