Avance parcial pestaña 1 completa.
Vista y controlador de la pestaña 1
Resolviendo merge
Merge branch 'master' of https://github.com/tereom/cliente_web2py

Conflicts:
	models/1_conglomerado_model.py
	progress.log