Merge branch 'master' of https://github.com/xfra35/f3-cron

# Conflicts:
#	lib/cron.php
