Ajustes
Calendario.
Calendar
Modal v1 - jquery
mEJORA
fedesabado
Merge remote-tracking branch 'origin/branch' into branch

Conflicts:
	protected/controllers/InmuebleController.php
fedelastsabado
h
Calendario
Merge branch 'branch' of https://github.com/tecnoinf2014/InmueblesUy.git into branch
Merge branch 'develop' into branch
Import format
consulta
consulta - controller usuario
jSON
Web Services - Herramiento de calculo
Merge branch 'developDom' into branch
Merge branch 'branch' of https://github.com/tecnoinf2014/InmueblesUy.git into branch
Merge branch 'developDom' into branch