changed name of boilerplate, deleted htaaccess
Merge branch 'develop'