Improved htaccess
Merge branch 'master' of https://bitbucket.org/shmyli/shmyli