Problem/User-Register

Register
Merge branch 'master' of https://github.com/mariomhu/xp

Conflicts:
	application/views/scripts/user/register.phtml