Conflictos solucionados
Merge branch 'master' of git@github.com:ULE-Bank/payments.git

Conflicts:
	ulebank/src/test/java/es/unileon/ulebank/service/SimpleCardDaoTests.java