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

Conflicts:
	.settings/org.eclipse.core.resources.prefs