.
Merge branch 'master' of git@github.com:mroland/SapWebEscrita.git

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/br/com/escrita/sapweb/dao/ChamadoTecnicoDAO.java