Fix htaccess issue
Merge branch 'master' of github.com:sboye/djif