Agrega funcion de javascript para impresion de tarjeta
Implementa internacionalización en javascript y actualiza función para imprimir tarjeta.
Merge branch 'master' into print-card-template
Agrega clases de css para la tarjeta (vacias).
se agregan fixtures a modulos
composer Lock
Merge branch 'master' of https://github.com/inodata/flora into fixtures
Merge branch 'master' of https://github.com/inodata/flora
Merge branch 'master' of https://github.com/inodata/flora into fixtures
Merge branch 'master' into fixtures
Merge branch 'fixtures' into distribution-ajax
Distribution Controller agregada accion
Merge branch 'master' into distribution-ajax
Merge branch 'master' into print-card-template

Conflicts:
	src/Inodata/FloraBundle/Resources/public/css/main.css
	src/Inodata/FloraBundle/Resources/views/Order/edit.html.twig
Merge branch 'print-card-template'
Correcion de conflicto con entity anterior (inoOrder)
Agregado cascaron impresion listado de distribucion
Merge branch 'master' into distribution-ajax
i18n agregado a mensajes flash javascript