Merge branch 'fix'

.htaccess

     RewriteCond %{SCRIPT_FILENAME} !-f
     RewriteCond %{SCRIPT_FILENAME} !-d
 
-    RewriteRule ^(.*)$ index.php?uri=/$1 [NC,L,QSA]
+    RewriteRule ^(.*)$   index.php?uri=/$1    [NC,L,QSA]
 </IfModule>