fixed htaccess
Merge branch 'upstream/ada-api'