commit 2
Merge remote-tracking branch 'encuesta/master'

Conflicts:
	app/tmp/cache/models/cake_model_default_encuestas_list
	app/tmp/cache/models/cake_model_default_usuarios
	app/tmp/cache/persistent/cake_core_default_es-ar
	app/tmp/cache/persistent/cake_core_dir_map
	app/tmp/cache/persistent/cake_core_file_map
	app/tmp/cache/persistent/cake_core_object_map
	app/tmp/logs/debug.log
	app/tmp/logs/error.log