Update .htaccess
Merge branch 'master' of http://github.com/Joimer/JoimFW