.
.
.
.
.
Merge branch 'master' of https://github.com/mroland/SapWebEscrita.git

Conflicts:
	WebContent/pages/regiao.xhtml
	src/br/com/escrita/sapweb/dao/RegiaoDAO.java