.
Merge branch 'master' of https://github.com/unirio-dtic/web2py_projetos

Conflicts:
	.gitignore