Confirm Email done!
Confirmemail fixed!
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts:
	application/controllers/registration.php
Merge branch 'master' of https://github.com/zentojamorn/kafra