suej htaccess edits
Merge branch 'htaccess'