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

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git
z
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git

Conflicts:
	WebContent/pages/remessaCR.xhtml
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git
Merge branch 'master' of https://github.com/mroland/SapWebYachtClube.git

Conflicts:
	WebContent/pages/remessaCR.xhtml