updated .htaccess file
image add
Merge branches 'dev' and 'master' into dev