Cambios en precio
Merge branch 'master' of https://github.com/jonsxaero/CademReporteBundle.git

Conflicts:
	src/Cadem/ReporteBundle/Resources/views/Detalle/index.html.twig
	src/Cadem/ReporteBundle/Resources/views/Evolucion/index.html.twig
	src/Cadem/ReporteBundle/Resources/views/Resumen/index.html.twig
Cambios en resumen para el detalle
Cambios varios
Detalle en resumen
Cambios cosmeticos y filtro
cambios chicos
Merge pull request #99 from diego1982chile/master

Cambios de diego