Add files for deployment
Fix supervisor settings
Merge branch 'deploy'
Fix merge conflicts