update cron deployment
marge conflict
Merge branch 'master' of github.com:unsecure/mensore

Conflicts:
	audit_fab/cron
	audit_fab/fabfile.py
	audit_fab/server