cambo
Merge branch 'master' of https://github.com/randyibarrola/inspector

Conflicts:
	src/Encuesta/DashboardBundle/Controller/TrivagoController.php
cambios finales