pestaña 2
cambios a cámara
Merge branch 'master' of https://github.com/tereom/cliente_web2py

Conflicts:
	models/2_camara_m.py