fix unicorn config
Merge branch 'develop'