i tornar a posar la plantilla com era
Merge branch 'master' of github.com:descala/haltr
Merge branch 'master' of github.com:descala/haltr
Merge branch 'master' of github.com:descala/haltr
Merge branch 'master' of github.com:oriol/haltr
Merge branch 'master' of github.com:descala/haltr
add EFFF UBL Format
Merge branch 'master' of github.com:descala/haltr
Fix some EFFF UBL issues
add attribute mimeCode in EmbeddedObject and correct template
Merge pull request #46 from oriol/master

add attribute mimeCode in EmbeddedObject and correct template
Merge branch 'master' into import_xml_invoices

Conflicts:
	app/controllers/invoices_controller.rb