Fixes for permissions
Merge branch 'scoot' into production
.htaccess changed