Updated htaccess
Merge branch 'develop'