en develop 2
registro+logincasi
en develop 2
juan
Merge branch 'develop' into branch

Conflicts:
	protected/runtime/application.log
site solo
c
contactos
Email - contactos
Merge branch 'localDevelop' into branch
Correcciones
Merge branch 'localDevelop' into branch
Correcciones mail
Correcciones
Merge branch 'localDevelop' into branch
Merge branch 'branch' of https://github.com/tecnoinf2014/InmueblesUy.git
into branch

Conflicts:
	protected/runtime/application.log
Algunos
From git
CRUD - USUARIO - CLIENTE
Correcciones