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

Conflicts:
	_ide_helper.php
	app/models/Cliente.php
	app/models/ClientePregunta.php
	app/models/Pregunta.php
	app/models/PreguntaRespuesta.php
	app/routes.php