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

Conflicts:
	app/views/charts/break/empresa.blade.php
	app/views/layouts/basic.blade.php
	public/js/bootstrap-select.js