more supervisor and uwsgi options
Merge remote-tracking branch 'origin/master'
update supervisor app
Merge branch 'master' into dev