Merge branch 'production' into dev
changed celery to use database scheduler
Merge branch 'dev' into production