Merge branch 'hotfix/skip_htaccess'
Merge branch 'release/0.2'
doc fixes
Merge branch 'hotfix/0.2_doc_updates' into develop