Terminacion de botones para imprimir factura y nota
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