Merge branch 'dev'

Fix .htaccess to refresh css files on modification