Merge branch 'dev' into production
Merge branch 'dev' into production
fixed bug with celeryd config
Merge branch 'production' into dev