CELERY_REDIS_DB to be fixed
Fixed conflicts
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
Merge branch 'master' of https://github.com/HumblePaper/FileFormatConversion
..