update to htaccess
Merge branch 'develop'