3er comit
commit edicion de encuestas
commit general de cambios al 9 de junio 2014
Merge branch 'master' of github.com:mwveliz/filven

Conflicts:
	config/schema.yml
	lib/model/InformeQuery.php
	lib/model/map/AccesoTableMap.php
	lib/model/map/ActividadTableMap.php
	lib/model/map/EncuestaTableMap.php
	lib/model/map/EstadoTableMap.php
	lib/model/map/FeriaTableMap.php
	lib/model/map/InformeTableMap.php
	lib/model/map/ItemTableMap.php
	lib/model/map/MunicipioTableMap.php
	lib/model/map/OpcionRespuestaTableMap.php
	lib/model/map/PaginaTableMap.php
	lib/model/map/PaisTableMap.php
	lib/model/map/PonenteRelActividadTableMap.php
	lib/model/map/PonenteTableMap.php
	lib/model/map/RespuestaEncuestaTableMap.php
	lib/model/map/RespuestaItemTableMap.php
	lib/model/map/SalaTableMap.php
	lib/model/map/TipoActividadTableMap.php
	lib/model/map/UsuarioTableMap.php
	lib/model/map/VisitanteTableMap.php
	lib/model/om/BaseAcceso.php
	lib/model/om/BaseAccesoPeer.php
	lib/model/om/BaseAccesoQuery.php
	lib/model/om/BaseActividad.php
	lib/model/om/BaseActividadPeer.php
	lib/model/om/BaseActividadQuery.php
	lib/model/om/BaseEncuesta.php
	lib/model/om/BaseEncuestaPeer.php
	lib/model/om/BaseEncuestaQuery.php
	lib/model/om/BaseEstado.php
	lib/model/om/BaseEstadoPeer.php
	lib/model/om/BaseEstadoQuery.php
	lib/model/om/BaseFeria.php
	lib/model/om/BaseFeriaPeer.php
	lib/model/om/BaseFeriaQuery.php
	lib/model/om/BaseInforme.php
	lib/model/om/BaseInformePeer.php
	lib/model/om/BaseInformeQuery.php
	lib/model/om/BaseItem.php
	lib/model/om/BaseItemPeer.php
	lib/model/om/BaseItemQuery.php
	lib/model/om/BaseMunicipio.php
	lib/model/om/BaseMunicipioPeer.php
	lib/model/om/BaseMunicipioQuery.php
	lib/model/om/BaseOpcionRespuesta.php
	lib/model/om/BaseOpcionRespuestaPeer.php
	lib/model/om/BaseOpcionRespuestaQuery.php
	lib/model/om/BasePagina.php
	lib/model/om/BasePaginaPeer.php
	lib/model/om/BasePaginaQuery.php
	lib/model/om/BasePais.php
	lib/model/om/BasePaisPeer.php
	lib/model/om/BasePaisQuery.php
	lib/model/om/BasePonente.php
	lib/model/om/BasePonentePeer.php
	lib/model/om/BasePonenteQuery.php
	lib/model/om/BasePonenteRelActividad.php
	lib/model/om/BasePonenteRelActividadPeer.php
	lib/model/om/BasePonenteRelActividadQuery.php
	lib/model/om/BaseRespuestaEncuesta.php
	lib/model/om/BaseRespuestaEncuestaPeer.php
	lib/model/om/BaseRespuestaEncuestaQuery.php
	lib/model/om/BaseRespuestaItem.php
	lib/model/om/BaseRespuestaItemPeer.php
	lib/model/om/BaseRespuestaItemQuery.php
	lib/model/om/BaseSala.php
	lib/model/om/BaseSalaPeer.php
	lib/model/om/BaseSalaQuery.php
	lib/model/om/BaseTipoActividad.php
	lib/model/om/BaseTipoActividadPeer.php
	lib/model/om/BaseTipoActividadQuery.php
	lib/model/om/BaseUsuario.php
	lib/model/om/BaseUsuarioPeer.php
	lib/model/om/BaseUsuarioQuery.php
	lib/model/om/BaseVisitante.php
	lib/model/om/BaseVisitantePeer.php
	lib/model/om/BaseVisitanteQuery.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardGroupPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardGroupTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardRememberKeyTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserGroupTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserPermissionTableMap.php
	plugins/sfGuardPlugin/lib/model/map/sfGuardUserTableMap.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroup.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPermissionPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupPermissionQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardGroupQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardPermissionPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardPermissionQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardRememberKey.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardRememberKeyPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardRememberKeyQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUser.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserGroup.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserGroupPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserGroupQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPermission.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPermissionPeer.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserPermissionQuery.php
	plugins/sfGuardPlugin/lib/model/om/BasesfGuardUserQuery.php