added .htaccess to .gitignore
Merge branch 'develop' into liveSystem