bug killer :D
Merge branch 'master' of https://github.com/heraldmatias/payrolls

Conflicts:
	src/Inei/Bundle/PayrollBundle/Controller/InventarioController.php
	src/Inei/Bundle/PayrollBundle/Form/Type/ConceptoFoliosType.php
	src/Inei/Bundle/PayrollBundle/Form/Type/PlanillaType.php
	src/Inei/Bundle/PayrollBundle/Form/Type/SearchTomosType.php
	src/Inei/Bundle/PayrollBundle/Resources/views/Planilla/add.html.twig