fixed routes in htaccess
Merge remote-tracking branch 'origin/htaccessFix'