Merge origin/master

Conflicts:
	web/funcionario/index.jsp