Merge remote-tracking branch 'origin/master'

Conflicts:
	ULE-Bank/src/es/unileon/ulebank/account/Account.java
	ULE-Bank/src/es/unileon/ulebank/command/CancelCardCommand.java
	ULE-Bank/src/es/unileon/ulebank/command/NewCardCommand.java
	ULE-Bank/src/es/unileon/ulebank/payments/Client.java
	ULE-Bank/src/es/unileon/ulebank/payments/CreditCard.java
	ULE-Bank/src/es/unileon/ulebank/payments/DebitCard.java
	ULE-Bank/src/es/unileon/ulebank/payments/PurseCard.java
	ULE-Bank/test/es/unileon/ulebank/command/NewCardCommandTest.java