03 de septiembre
03 sep
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/GraffController.php
	app/routes.php
	app/start/global.php
	app/views/charts/pie/historicoCategoria.blade.php
	app/views/sections/sidebar.blade.php