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

Conflicts:
	src/Inodata/FloraBundle/Entity/Order.php
Merge branch 'master' of https://github.com/inodata/flora.git

Conflicts:
	src/Inodata/FloraBundle/Entity/Order.php
Merge branch 'master' of https://github.com/inodata/flora.git
Merge branch 'master' of https://github.com/inodata/flora.git
Merge branch 'master' of https://github.com/inodata/flora.git
Avances finales en el modulo de cobranza
Merge branch 'master' of https://github.com/inodata/flora.git

Conflicts:
	src/Inodata/FloraBundle/Resources/public/js/print.js
Quita funcionalidad de hacer abonos y cortesen el modulo de cobranza
Filtros por rango de fecha en el modulo de cobranza