Merge branch 'master' of https://github.com/freedust1/hhamm

Conflicts:
	application/controllers/user.php
user