SALEFRONT-67 Captcha - Problem with generation of hash - update 1
Merge branch 'master' of https://github.com/aldrin15/supercms

Conflicts:
	application/controllers/register.php