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

Conflicts:
	protected/runtime/application.log
site solo
c
login registro
Merge branch 'branch' of https://github.com/tecnoinf2014/InmueblesUy.git
into branch

Conflicts:
	protected/controllers/SiteController.php
	protected/runtime/application.log
registro y login