Update public/.htaccess
Update public/.htaccess
Merge branch 'master' into dev
format
footer
Merge branch 'dev'