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

Conflicts:
	src/Cron/CronBundle/Entity/User.php~