merge cambios
Merge branch 'master' of https://github.com/pavel23/happyland

Conflicts:
	system/application/controllers/Profile.php