2.1.2.2
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/GraffController.php
	app/routes.php
	app/views/charts/pie/cliente.blade.php