merge
Merge branch 'master' of https://github.com/tereom/cliente_web2py

Conflicts:
	controllers/8_revision.py