Commit en branch guillermo
Contactos cambios
Cambios contacto
Merge branch 'guillermo'

Conflicts:
	protected/modules/user/controllers/RegistrationController.php
	protected/modules/user/models/User.php
	protected/runtime/application.log