Falo de recuperar conversaciones e recuperar mensajes solucionado, fallo cuando el servidor esta caido con TOAST
Clases con licencia, implementacion del servicio en proceso
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Register.apk
	bin/classes.dex
	bin/classes/com/ChiriChat/Controller/ComprobarConexionInternet.class
	bin/classes/com/ChiriChat/Controller/ListChats$1.class
	bin/classes/com/ChiriChat/Controller/ListChats.class
	bin/classes/com/ChiriChat/Controller/ListContacts$1.class
	bin/classes/com/ChiriChat/Controller/ListContacts$2.class
	bin/classes/com/ChiriChat/Controller/ListContacts$3.class
	bin/classes/com/ChiriChat/Controller/ListContacts$4.class
	bin/classes/com/ChiriChat/Controller/ListContacts.class
	bin/classes/com/ChiriChat/Controller/ListConversation$1.class
	bin/classes/com/ChiriChat/Controller/ListConversation$2.class
	bin/classes/com/ChiriChat/Controller/ListConversation$3.class
	bin/classes/com/ChiriChat/Controller/ListConversation.class
	bin/classes/com/ChiriChat/Controller/Opciones$1.class
	bin/classes/com/ChiriChat/Controller/Opciones.class
	bin/classes/com/ChiriChat/Controller/Register.class
	bin/classes/com/ChiriChat/DataAccessObject/DAOWebServer/ChiriChatContactosDAO.class
	bin/classes/com/ChiriChat/DataAccessObject/DAOWebServer/ChiriChatConversacionesDAO.class
	bin/classes/com/ChiriChat/DataAccessObject/DAOWebServer/ChiriChatMensajesDAO.class
	bin/classes/com/ChiriChat/DataAccessObject/InterfacesDAO/IContactosDAO.class
	bin/classes/com/ChiriChat/DataAccessObject/InterfacesDAO/IConversacioneDAO.class
	bin/classes/com/ChiriChat/DataAccessObject/InterfacesDAO/IMensajesDAO.class
	bin/classes/com/ChiriChat/Factory/Factories/ChiriChatServerFactoryDAO.class
	bin/classes/com/ChiriChat/Factory/FactoryDAO.class
	bin/classes/com/ChiriChat/R$drawable.class
	bin/classes/com/ChiriChat/R$id.class
	bin/classes/com/ChiriChat/R$string.class
	bin/classes/com/ChiriChat/R$xml.class
	bin/classes/com/ChiriChat/SQLiteDataBaseModel/BDSQLite.class
	bin/classes/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosContactos.class
	bin/classes/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosConversaciones.class
	bin/classes/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosMensajes.class
	bin/classes/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosUsu_Conv.class
	bin/classes/com/ChiriChat/model/Contactos.class
	bin/classes/com/ChiriChat/model/Conversaciones$1.class
	bin/classes/com/ChiriChat/model/Conversaciones.class
	bin/classes/com/ChiriChat/model/Mensajes$1.class
	bin/classes/com/ChiriChat/model/Mensajes.class
	bin/resources.ap_
	gen/com/ChiriChat/R.java
	res/layout/activity_register.xml
	res/layout/edit_my_perfil_user.xml
	res/layout/item_chat.xml
	res/layout/list_chats.xml
	res/menu/menu_activity_contacts.xml
	res/values-es/strings.xml
	src/com/ChiriChat/Adapter/ViewHolderConver.java
	src/com/ChiriChat/Adapter/myAdapterChats.java
	src/com/ChiriChat/AsynTask/ActualizarUsuarios.java
	src/com/ChiriChat/AsynTask/CrearConversacion.java
	src/com/ChiriChat/Controller/ComprobarConexionInternet.java
	src/com/ChiriChat/Controller/EditMyPerfilUser.java
	src/com/ChiriChat/Controller/ListChats.java
	src/com/ChiriChat/Controller/ListContacts.java
	src/com/ChiriChat/Controller/ListConversation.java
	src/com/ChiriChat/Controller/Register.java
	src/com/ChiriChat/DataAccessObject/DAOWebServer/ChiriChatContactosDAO.java
	src/com/ChiriChat/Factory/Factories/ChiriChatServerFactoryDAO.java
	src/com/ChiriChat/Language/Language.java
	src/com/ChiriChat/SQLiteDataBaseModel/BDSQLite.java
	src/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosContactos.java
	src/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosConversaciones.java
	src/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosMensajes.java
	src/com/ChiriChat/SQLiteDataBaseModel/GestionBaseDatosUsu_Conv.java
	src/com/ChiriChat/model/Contactos.java
	src/com/ChiriChat/model/Conversaciones.java
	src/com/ChiriChat/model/Mensajes.java