Adding missing '.gitignore' & '.htaccess'
Merge branch 'develop'