SP-01_Configuration Done
Fix_htaccess
Merge branch 'hotfix/htaccess_fix' into develop