Merge branch 'master' into develop
Added support to old unicorn apps for Nginx.
Fix style