fededomingo
Merge remote-tracking branch 'origin/branch' into branch

Conflicts:
	protected/controllers/ClienteController.php
	protected/controllers/InmuebleController.php
	protected/controllers/UsuarioController.php
	protected/views/layouts/mainAdmin.php
elimine el section de boostrap agregado del layout admin, galeria de
imagenes por inmueble en la busqueda y mas
Merge branch 'developDom' into branch
fede lunes 1
Merge remote-tracking branch 'origin/branch' into branch
fede lunes  mas juan
fede-lunes-21
Fede,,,Merge remote-tracking branch 'origin/branch' into branch

Conflicts:
	protected/controllers/ClienteController.php
	protected/controllers/InmuebleController.php
	protected/controllers/UsuarioController.php
	protected/views/inmueble/_reserva.php
	protected/views/inmuebleSite/admin.php
	protected/views/layouts/mainAdmin.php
Merge remote-tracking branch 'origin/branch' into branch

Conflicts:
	protected/views/layouts/mainClient.php
ada
mb