solved problem
Merge branch 'master' of https://github.com/Ceicom/magento-boleto

Conflicts:
	README.md