Improve .htaccess
Merge branch 'master' of https://github.com/allejo/bzion

Conflicts:
	.htaccess
Fix part of the previous commit