Add .htaccess to .gitignore
Merge branch 'master' of ../stage