From git
CRUD - USUARIO - CLIENTE
Correcciones
Merge branch 'branch' into localDevelop

Conflicts:
	protected/runtime/gii-1.1.14/CrudCode.php
	protected/views/layouts/mainAdmin.php
commit
Usuario - Contacto
Validaciones
Merge branch 'branch' of https://github.com/tecnoinf2014/InmueblesUy.git into branch
Merge