Minor changes
Merge branch 'platypus-fix' of github.com:premium-minds/billy into platypus-fix

Conflicts:
	billy-platypus/src/test/java/com/premiumminds/billy/portugal/test/services/export/SAFTExportTest.java
Fix merge