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

Conflicts:
	WebContent/resources/cnab/LayoutCNAB400RetornoDebito.txg.xml
	WebContent/resources/cnab/LayoutRemessaDebitoBRASIL.txg.xml
	WebContent/resources/cnab/LayoutRemessaDebitoITAU.txg.xml
	WebContent/resources/cnab/LayoutRemessaDebitoREAL.txg.xml