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

Conflicts:
	WebContent/pages/medicaoGraficaCentral.xhtml