Avances de lista Nash
Merge branch 'CONANP' of https://github.com/tereom/cliente_web2py into CONANP

Conflicts:
	views/06_registros_extra/index1.html
	views/06_registros_extra/index2.html
	views/06_registros_extra/index3.html
Merge branch 'CONANP' of https://github.com/tereom/cliente_web2py into CONANP