Merge branch 'hotfix/fix-nginx-alminium'
Fix /svn & /git config in Nginx
Merge branch 'master' into develop