Added .htaccess

Added .htaccess file for server configurations
Merge branch 'dev'