Chartbroker
cambios nuevos
Merge branch 'dev' of https://github.com/mazebeat/Laravel4-Intelidata into dev

Conflicts:
	.gitignore
	app/views/formulario.blade.php
	public/css/frontend.css