celery deleted
Merge remote-tracking branch 'origin/master'

Conflicts:
	WhoAmI/settings.py