teste

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

Conflicts:
	application/controllers/UserController.php
Merge branch 'master' of https://github.com/mariomhu/xp