Merge branch 'release/v1.0.0'
Merge branch 'master' of github.com:neontribe/DrupalMake
Added htaccess
Merge branch 'master' into develop
CHANGELOG
Merge branch 'release/v1.0.2'
Merge tag 'v1.0.2' into develop

Added htaccess support