corregida una cosilla en el usermodule
Merge branch 'master' of https://github.com/Guillermoo/promos

Conflicts:
	protected/modules/user/UserModule.php