Avances en el modulo de cobros
Merge branch 'master' of https://github.com/inodata/flora.git

Conflicts:
	src/Inodata/FloraBundle/Resources/translations/InodataFloraBundle.es.yml