Removed index.php
Removed index.php fixed
Updated .htaccess for working on subdirs
Merge origin/master