setup instructions and .htaccess settings
Merge branch 'develop'