historico por categorias
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/assets/js/chart.js
	app/controllers/GraffController.php
	app/routes.php
	app/views/test.blade.php
	public/js/frontend.js