Merge branch 'master' of github.com:besttec/MBCredito

Conflicts:
	src/SerBinario/MBCredito/MBCreditoBundle/Controller/DefaultController.php