Added the supervisord conf file to project
Added log directory for supervisord
Merge branch 'dev'