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

Conflicts:
	app/assets/js/frontend.js
	app/controllers/GraffController.php
	app/views/layouts/menus/menu_cliente.blade.php
	public/js/frontend.js
	public/js/frontend.min.js