Merge branch 'develop'
Merge branch 'develop'
fix nginx autoindex and htpasswd
Merge branch 'hotfix/static-nginx-fix'
Merge branch 'master' into develop