removed .htaccess from git
fixed reserved word issue on misc/ajax.js file
remove .htaccess from git on prod b
Merge branch 'dev' into prod