Merge remote-tracking branch 'origin/develop' into develop
* Added htaccess to the git ignore list to keep a local copy of it