Merge branch 'hotfix/logo-url'
add htaccess test include
Merge branch 'hotfix/docs' into develop