hashpassword + verifypassword based on php 5.5
Merge branch 'master' of https://github.com/aimed/php-vault

Conflicts:
	lib/vault.class.php