Add celery hack
Merge branch 'develop'
Upgrade packages