diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js
index 80b295ed1..8e8a73695 100644
--- a/dev/Stores/User/App.js
+++ b/dev/Stores/User/App.js
@@ -53,7 +53,7 @@
 
 		this.contactsIsAllowed = ko.observable(false);
 
-		this.attahcmentsActions = ko.observableArray([]);
+		this.attachmentsActions = ko.observableArray([]);
 
 		this.devEmail = '';
 		this.devPassword = '';
@@ -70,8 +70,8 @@
 
 		this.contactsIsAllowed(!!Settings.settingsGet('ContactsIsAllowed'));
 
-		var mAttahcmentsActions = Settings.settingsGet('AttahcmentsActions');
-		this.attahcmentsActions(Utils.isNonEmptyArray(mAttahcmentsActions) ? mAttahcmentsActions : []);
+		var mAttachmentsActions = Settings.settingsGet('AttachmentsActions');
+		this.attachmentsActions(Utils.isNonEmptyArray(mAttachmentsActions) ? mAttachmentsActions : []);
 
 		this.devEmail = Settings.settingsGet('DevEmail');
 		this.devPassword = Settings.settingsGet('DevPassword');
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index a611b78a6..2151d24cd 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -65,7 +65,7 @@
 
 		this.pswp = null;
 
-		this.attahcmentsActions = AppStore.attahcmentsActions;
+		this.attachmentsActions = AppStore.attachmentsActions;
 
 		this.message = MessageStore.message;
 		this.messageListChecked = MessageStore.messageListChecked;
@@ -90,18 +90,18 @@
 		this.showAttachmnetControls = ko.observable(false);
 
 		this.allowAttachmnetControls = ko.computed(function () {
-			return 0 < this.attahcmentsActions().length;
+			return 0 < this.attachmentsActions().length;
 		}, this);
 
 		this.downloadAsZipAllowed = ko.computed(function () {
-			return -1 < Utils.inArray('zip', this.attahcmentsActions());
+			return -1 < Utils.inArray('zip', this.attachmentsActions());
 		}, this);
 
 		this.downloadAsZipLoading = ko.observable(false);
 		this.downloadAsZipError = ko.observable(false).extend({'falseTimeout': 7000});
 
 		this.saveToOwnCloudAllowed = ko.computed(function () {
-			return -1 < Utils.inArray('owncloud', this.attahcmentsActions());
+			return -1 < Utils.inArray('owncloud', this.attachmentsActions());
 		}, this);
 
 		this.saveToOwnCloudLoading = ko.observable(false);
@@ -123,7 +123,7 @@
 		}, this);
 
 		this.saveToDropboxAllowed = ko.computed(function () {
-			return -1 < Utils.inArray('dropbox', this.attahcmentsActions());
+			return -1 < Utils.inArray('dropbox', this.attachmentsActions());
 		}, this);
 
 		this.saveToDropboxLoading = ko.observable(false);
diff --git a/package.json b/package.json
index 2ecee54df..0cce4a40c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.9.0",
-	"release": "323",
+	"release": "324",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
diff --git a/rainloop/v/0.0.0/app/handle.php b/rainloop/v/0.0.0/app/handle.php
index ebb703d10..1de59f78c 100644
--- a/rainloop/v/0.0.0/app/handle.php
+++ b/rainloop/v/0.0.0/app/handle.php
@@ -22,7 +22,7 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 	function rainLoopSplAutoloadNamespaces()
 	{
 		return RAINLOOP_INCLUDE_AS_API_DEF ? array('RainLoop') :
-			array('RainLoop', 'Facebook', 'GuzzleHttp', 'Symfony', 'PHPThumb', 'Sabre');
+			array('RainLoop', 'Facebook', 'GuzzleHttp', 'PHPThumb', 'SabreForRainLoop');
 	}
 
 	/**
@@ -41,7 +41,7 @@ if (!\defined('RAINLOOP_APP_LIBRARIES_PATH'))
 		{
 			if (0 === \strpos($sClassName, $sNamespaceName.'\\'))
 			{
-				if ('Sabre' === $sNamespaceName && !RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
+				if ('SabreForRainLoop' === $sNamespaceName && !RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
 				{
 					\define('RL_MB_FIXED', true);
 					include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/Common/MbStringFix.php';
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index 5896a536b..caab6bdaf 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -86,4 +86,21 @@ class DateTimeHelper
 		$oDateTime = \DateTime::createFromFormat('Y-m-d H:i:s O', \trim($sDateTime), \MailSo\Base\DateTimeHelper::GetUtcTimeZoneObject());
 		return $oDateTime ? $oDateTime->getTimestamp() : 0;
 	}
+
+	/**
+	 * Parse date string formated as "2015-05-08T14:32:18.483-07:00"
+	 *
+	 * @param string $sDateTime
+	 *
+	 * @return int
+	 */
+	public static function TryToParseSpecEtagFormat($sDateTime)
+	{
+		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/(:[\d]{2})\.[\d]{3}/', '$1', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/(-[\d]{2})T([\d]{2}:)/', '$1 $2', \trim($sDateTime)));
+		$sDateTime = \trim(\preg_replace('/([\-+][\d]{2}):([\d]{2})$/', ' $1$2', \trim($sDateTime)));
+
+		return \MailSo\Base\DateTimeHelper::ParseDateStringType1($sDateTime);
+	}
 }
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
index e5a0a37f4..475d8c39c 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -165,7 +165,7 @@ class Logger extends \MailSo\Base\Collection
 	 */
 	public function AddSecret($sWord)
 	{
-		if (0 < \strlen(\trim($sWord)))
+		if (\is_string($sWord) && 0 < \strlen(\trim($sWord)))
 		{
 			$this->aSecretWords[] = $sWord;
 			$this->aSecretWords = \array_unique($this->aSecretWords);
diff --git a/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php b/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
index 7521b9d90..a86c8c91e 100644
--- a/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
+++ b/rainloop/v/0.0.0/app/libraries/PHPThumb/PHPThumb.php
@@ -27,11 +27,6 @@ abstract class PHPThumb
      */
     protected $fileName;
 
-    /**
-     * @var \Symfony\Component\Filesystem\Filesystem
-     */
-    protected $filesystem;
-
     /**
      * What the file format is (mime-type)
      *
@@ -59,7 +54,6 @@ abstract class PHPThumb
      */
     public function __construct($fileName, array $options = array(), array $plugins = array())
     {
-        $this->filesystem = new \Symfony\Component\Filesystem\Filesystem();
         $this->fileName    = $fileName;
         $this->remoteImage = false;
 
@@ -89,9 +83,9 @@ abstract class PHPThumb
             return true;
         }
 
-        if($this->filesystem->exists($filename)) {
-            return true;
-        }
+		if (file_exists($filename)) {
+			return true;
+		}
 
         return false;
     }
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index b2835562f..6e915c727 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1276,6 +1276,14 @@ class Actions
 		return $this->GetAccountFromCustomToken($this->getAuthToken(), $bThrowExceptionOnFalse);
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsOpen()
+	{
+		return !$this->PremProvider();
+	}
+
 	/**
 	 * @param bool $bAdmin
 	 * @param string $sAuthAccountHash = ''
@@ -1349,7 +1357,7 @@ class Actions
 			'PremType' => false,
 			'Admin' => array(),
 			'Capa' => array(),
-			'AttahcmentsActions' => array(),
+			'AttachmentsActions' => array(),
 			'Plugins' => array()
 		);
 
@@ -1357,17 +1365,17 @@ class Actions
 		{
 			if (!!\class_exists('ZipArchive'))
 			{
-				$aResult['AttahcmentsActions'][] = 'zip';
+				$aResult['AttachmentsActions'][] = 'zip';
 			}
 
 			if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('\\OCP\\Files'))
 			{
-				$aResult['AttahcmentsActions'][] = 'owncloud';
+				$aResult['AttachmentsActions'][] = 'owncloud';
 			}
 
 			if ($oConfig->Get('social', 'dropbox_enable', false) && 0 < \strlen(\trim($oConfig->Get('social', 'dropbox_api_key', ''))))
 			{
-				$aResult['AttahcmentsActions'][] = 'dropbox';
+				$aResult['AttachmentsActions'][] = 'dropbox';
 			}
 		}
 
@@ -2833,7 +2841,7 @@ class Actions
 					if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('\\OCP\\Files'))
 					{
 						$sSaveFolder = $this->Config()->Get('labs', 'owncloud_save_folder', '');
-						if (!empty($sSaveFolder))
+						if (empty($sSaveFolder))
 						{
 							$sSaveFolder = 'Attachments';
 						}
@@ -6776,6 +6784,8 @@ class Actions
 				$oContact->Etag = \md5($oContact->ToVCard());
 			}
 
+			$oContact->PopulateDisplayAndFullNameValue(true);
+
 			$bResult = $oAddressBookProvider->ContactSave($oAccount->ParentEmailHelper(), $oContact);
 		}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index 8ea5a138e..dfe914de1 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -318,7 +318,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 	{
 		$iCount = 0;
 
-		if (\class_exists('Sabre\DAV\Client') && $this->IsActive() && \is_string($sVcfData))
+		if (\class_exists('SabreForRainLoop\DAV\Client') && $this->IsActive() && \is_string($sVcfData))
 		{
 			$sVcfData = \trim($sVcfData);
 			if ("\xef\xbb\xbf" === \substr($sVcfData, 0, 3))
@@ -329,7 +329,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 			$oVCardSplitter = null;
 			try
 			{
-				$oVCardSplitter = new \Sabre\VObject\Splitter\VCard($sVcfData);
+				$oVCardSplitter = new \SabreForRainLoop\VObject\Splitter\VCard($sVcfData);
 			}
 			catch (\Exception $oExc)
 			{
@@ -344,13 +344,13 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 
 				while ($oVCard = $oVCardSplitter->getNext())
 				{
-					if ($oVCard instanceof \Sabre\VObject\Component\VCard)
+					if ($oVCard instanceof \SabreForRainLoop\VObject\Component\VCard)
 					{
 						\MailSo\Base\Utils::ResetTimeLimit();
 
 						if (empty($oVCard->UID))
 						{
-							$oVCard->UID = \Sabre\DAV\UUIDUtil::getUUID();
+							$oVCard->UID = \SabreForRainLoop\DAV\UUIDUtil::getUUID();
 						}
 
 						$oContact->PopulateByVCard($oVCard->UID, $oVCard->serialize());
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
index 7fd425139..41085ff1b 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
@@ -66,8 +66,9 @@ class Contact
 		$this->Etag = '';
 	}
 
-	public function UpdateDependentValues()
+	public function PopulateDisplayAndFullNameValue($bForceFullNameReplace = false)
 	{
+		$sFullName = '';
 		$sLastName = '';
 		$sFirstName = '';
 		$sEmail = '';
@@ -100,8 +101,12 @@ class Contact
 					{
 						$sFirstName = $oProperty->Value;
 					}
-					else if (\in_array($oProperty->Type, array(
-						PropertyType::FULLNAME, PropertyType::PHONE
+					else if ('' === $sFullName && PropertyType::FULLNAME === $oProperty->Type)
+					{
+						$sFullName = $oProperty->Value;
+					}
+					else if ('' === $sOther && \in_array($oProperty->Type, array(
+						PropertyType::PHONE
 					)))
 					{
 						$sOther = $oProperty->Value;
@@ -110,25 +115,26 @@ class Contact
 			}
 		}
 
-		if (empty($this->IdContactStr))
-		{
-			$this->RegenerateContactStr();
-		}
+		$sDisplay = $bForceFullNameReplace ? '' : \trim($sFullName);
 
-		$sDisplay = '';
-		if (0 < \strlen($sLastName) || 0 < \strlen($sFirstName))
+		if ('' === $sDisplay && (0 < \strlen($sLastName) || 0 < \strlen($sFirstName)))
 		{
 			$sDisplay = \trim($sFirstName.' '.$sLastName);
 		}
 
-		if ('' === $sDisplay && 0 < \strlen($sEmail))
+		if ('' === $sDisplay)
+		{
+			$sDisplay = \trim($sFullName);
+		}
+
+		if ('' === $sDisplay)
 		{
 			$sDisplay = \trim($sEmail);
 		}
 
 		if ('' === $sDisplay)
 		{
-			$sDisplay = $sOther;
+			$sDisplay = \trim($sOther);
 		}
 
 		$this->Display = \trim($sDisplay);
@@ -145,13 +151,23 @@ class Contact
 		}
 	}
 
+	public function UpdateDependentValues()
+	{
+		if (empty($this->IdContactStr))
+		{
+			$this->RegenerateContactStr();
+		}
+
+		$this->PopulateDisplayAndFullNameValue();
+	}
+
 	/**
 	 * @return array
 	 */
 	public function RegenerateContactStr()
 	{
-		$this->IdContactStr = \class_exists('Sabre\DAV\Client') ?
-			\Sabre\DAV\UUIDUtil::getUUID() : \MailSo\Base\Utils::Md5Rand();
+		$this->IdContactStr = \class_exists('SabreForRainLoop\DAV\Client') ?
+			\SabreForRainLoop\DAV\UUIDUtil::getUUID() : \MailSo\Base\Utils::Md5Rand();
 	}
 
 	/**
@@ -186,7 +202,7 @@ class Contact
 	{
 		$this->UpdateDependentValues();
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return '';
 		}
@@ -201,7 +217,7 @@ class Contact
 		{
 			try
 			{
-				$oVCard = \Sabre\VObject\Reader::read($sPreVCard);
+				$oVCard = \SabreForRainLoop\VObject\Reader::read($sPreVCard);
 			}
 			catch (\Exception $oExc)
 			{
@@ -213,9 +229,14 @@ class Contact
 			}
 		}
 
+//		if ($oLogger)
+//		{
+//			$oLogger->WriteDump($sPreVCard);
+//		}
+
 		if (!$oVCard)
 		{
-			$oVCard = new \Sabre\VObject\Component\VCard();
+			$oVCard = new \SabreForRainLoop\VObject\Component\VCard();
 		}
 
 		$oVCard->VERSION = '3.0';
@@ -223,7 +244,7 @@ class Contact
 
 		unset($oVCard->FN, $oVCard->EMAIL, $oVCard->TEL, $oVCard->URL, $oVCard->NICKNAME);
 
-		$sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
+		$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
 		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ &$oProperty)
 		{
 			if ($oProperty)
@@ -240,6 +261,9 @@ class Contact
 					case PropertyType::NOTE:
 						$oVCard->NOTE = $oProperty->Value;
 						break;
+					case PropertyType::UID:
+						$sUid = $oProperty->Value;
+						break;
 					case PropertyType::FIRST_NAME:
 						$sFirstName = $oProperty->Value;
 						break;
@@ -278,7 +302,7 @@ class Contact
 			}
 		}
 
-		$oVCard->UID = $this->IdContactStr;
+		$oVCard->UID = empty($sUid) ? $this->IdContactStr : $sUid;
 		$oVCard->N = array($sLastName, $sFirstName, $sMiddleName, $sPrefix, $sSuffix);
 		$oVCard->REV = \gmdate('Ymd', $this->Changed).'T'.\gmdate('His', $this->Changed).'Z';
 
@@ -505,7 +529,7 @@ class Contact
 
 		$this->Properties = array();
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return false;
 		}
@@ -515,9 +539,11 @@ class Contact
 			$this->Etag = $sEtag;
 		}
 
+		$this->IdContactStr = $sUid;
+
 		try
 		{
-			$oVCard = \Sabre\VObject\Reader::read($sVCard);
+			$oVCard = \SabreForRainLoop\VObject\Reader::read($sVCard);
 		}
 		catch (\Exception $oExc)
 		{
@@ -526,18 +552,24 @@ class Contact
 				$oLogger->WriteException($oExc);
 				$oLogger->WriteDump($sVCard);
 			}
-
-			$this->IdContactStr = $sUid;
 		}
 
+//		if ($oLogger)
+//		{
+//			$oLogger->WriteDump($sVCard);
+//		}
+
+		$bOwnCloud = false;
 		$aProperties = array();
+
 		if ($oVCard)
 		{
+			$bOwnCloud = empty($oVCard->PRODID) ? false :
+				false !== \strpos(\strtolower($oVCard->PRODID), 'owncloud');
+
 			$bOldVersion = empty($oVCard->VERSION) ? false :
 				\in_array((string) $oVCard->VERSION, array('2.1', '2.0', '1.0'));
 
-			$this->IdContactStr = $oVCard->UID ? (string) $oVCard->UID : \Sabre\DAV\UUIDUtil::getUUID();
-
 			if (isset($oVCard->FN) && '' !== \trim($oVCard->FN))
 			{
 				$sValue = $this->getPropertyValueHelper($oVCard->FN, $bOldVersion);
@@ -612,6 +644,14 @@ class Contact
 				$this->addArrayPropertyHelper($aProperties, $oVCard->TEL, PropertyType::PHONE);
 			}
 
+			$sUidValue = $oVCard->UID ? (string) $oVCard->UID : \SabreForRainLoop\DAV\UUIDUtil::getUUID();
+			$aProperties[] = new Property(PropertyType::UID, $sUidValue);
+
+			if (empty($this->IdContactStr))
+			{
+				$this->IdContactStr = $sUidValue;
+			}
+
 			$this->Properties = $aProperties;
 		}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
index a301ffe2f..8356d5e8d 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
@@ -10,7 +10,7 @@ class Property
 	 * @var int
 	 */
 	public $IdProperty;
-	
+
 	/**
 	 * @var int
 	 */
@@ -49,7 +49,7 @@ class Property
 	public function Clear()
 	{
 		$this->IdProperty = 0;
-		
+
 		$this->Type = PropertyType::UNKNOWN;
 		$this->TypeStr = '';
 
@@ -59,6 +59,15 @@ class Property
 		$this->Frec = 0;
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function IsName()
+	{
+		return \in_array($this->Type, array(PropertyType::FULLNAME, PropertyType::FIRST_NAME,
+			PropertyType::LAST_NAME, PropertyType::MIDDLE_NAME, PropertyType::NICK_NAME));
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -66,7 +75,7 @@ class Property
 	{
 		return PropertyType::EMAIl === $this->Type;
 	}
-	
+
 	/**
 	 * @return bool
 	 */
@@ -111,7 +120,7 @@ class Property
 		$this->Value = \trim($this->Value);
 		$this->ValueCustom = \trim($this->ValueCustom);
 		$this->TypeStr = \trim($this->TypeStr);
-		
+
 		if (0 < \strlen($this->Value))
 		{
 			// lower
@@ -120,6 +129,11 @@ class Property
 				$this->Value = \MailSo\Base\Utils::StrToLowerIfAscii($this->Value);
 			}
 
+			if ($this->IsName())
+			{
+				$this->Value = \preg_replace('/[\s]+/u', ' ', $this->Value);
+			}
+
 			// phones clear value for searching
 			if ($this->IsPhone())
 			{
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
index 4068e4abc..5b1bdae94 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
@@ -6,8 +6,9 @@ class PropertyType
 {
 	const UNKNOWN = 0;
 
+	const UID = 9;
 	const FULLNAME = 10;
-	
+
 	const FIRST_NAME = 15;
 	const LAST_NAME = 16;
 	const MIDDLE_NAME = 17;
@@ -21,7 +22,7 @@ class PropertyType
 //	const MOBILE = 32;
 //	const FAX = 33;
 	const WEB_PAGE = 32;
-	
+
 	const BIRTHDAY = 40;
 
 	const FACEBOOK = 90;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index b2100bc05..21fd6e76d 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -117,11 +117,14 @@ class PdoAddressBook
 		try
 		{
 			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}getlastmodified',
+				'{DAV:}resourcetype',
 				'{DAV:}getetag'
 			), 1);
 
+//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Exception $oException)
 		{
@@ -137,10 +140,11 @@ class PdoAddressBook
 				if (!empty($sKey) && is_array($aItem))
 				{
 					$aItem = \array_change_key_case($aItem, \CASE_LOWER);
-					if (isset($aItem['{dav:}getetag'], $aItem['{dav:}getlastmodified']))
+					if (isset($aItem['{dav:}getetag']))
 					{
 						$aMatch = array();
-						if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1]))
+						if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1]) &&
+							(!$aItem['{dav:}resourcetype'] || !$aItem['{dav:}resourcetype']->is('{DAV:}collection')))
 						{
 							$sVcfFileName = \urldecode(\urldecode($aMatch[1]));
 							$sKeyID = \preg_replace('/\.vcf$/i', '', $sVcfFileName);
@@ -150,10 +154,23 @@ class PdoAddressBook
 								'uid' => $sKeyID,
 								'vcf' => $sVcfFileName,
 								'etag' => \trim(\trim($aItem['{dav:}getetag']), '"\''),
-								'lastmodified' => $aItem['{dav:}getlastmodified'],
-								'changed' => \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($aItem['{dav:}getlastmodified'])
+								'lastmodified' => '',
+								'changed' => 0
 							);
 
+							if (isset($aItem['{dav:}getlastmodified']))
+							{
+								$mResult[$sKeyID]['lastmodified'] = $aItem['{dav:}getlastmodified'];
+								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
+									$aItem['{dav:}getlastmodified']);
+							}
+							else
+							{
+								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::TryToParseSpecEtagFormat($mResult[$sKeyID]['etag']);
+								$mResult[$sKeyID]['lastmodified'] = 0 < $mResult[$sKeyID]['changed'] ?
+									\gmdate('c', $mResult[$sKeyID]['changed']) : '';
+							}
+
 							$mResult[$sKeyID]['changed_'] = \gmdate('c', $mResult[$sKeyID]['changed']);
 						}
 					}
@@ -168,10 +185,10 @@ class PdoAddressBook
 	{
 		\MailSo\Base\Utils::ResetTimeLimit();
 
-		$this->oLogger->Write($sCmd.' '.$sUrl.('PUT' === $sCmd && null !== $mData ? ' ('.\strlen($mData).')' : ''),
+		$this->oLogger->Write($sCmd.' '.$sUrl.(('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData ? ' ('.\strlen($mData).')' : ''),
 			\MailSo\Log\Enumerations\Type::INFO, 'DAV');
 
-		if ('PUT' === $sCmd)
+		if ('PUT' === $sCmd || 'POST' === $sCmd)
 		{
 			$this->oLogger->Write($mData, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
 		}
@@ -179,13 +196,21 @@ class PdoAddressBook
 		$oResponse = false;
 		try
 		{
-			$oResponse = 'PUT' === $sCmd && null !== $mData ?
-				$oClient->request($sCmd, $sUrl, $mData) : $oClient->request($sCmd, $sUrl);
-
-			if ('GET' === $sCmd && false)
+			if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData)
 			{
-				$this->oLogger->WriteDump($oResponse, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+				$oResponse = $oClient->request($sCmd, $sUrl, $mData, array(
+					'Content-Type' => 'text/vcard; charset=utf-8'
+				));
 			}
+			else
+			{
+				$oResponse = $oClient->request($sCmd, $sUrl);
+			}
+
+//			if ('GET' === $sCmd)
+//			{
+//				$this->oLogger->WriteDump($oResponse, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+//			}
 		}
 		catch (\Exception $oException)
 		{
@@ -196,24 +221,297 @@ class PdoAddressBook
 	}
 
 	/**
-	 * @param string $sEmail
-	 * @param string $sUrl
+	 * @param \SabreForRainLoop\DAV\Client $oClient
+	 * @param string $sPath
+	 *
+	 * @return bool
+	 */
+	private function detectionPropFind($oClient, $sPath)
+	{
+		$aResponse = null;
+
+		try
+		{
+			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+			$aResponse = $oClient->propFind($sPath, array(
+				'{DAV:}current-user-principal',
+				'{DAV:}resourcetype',
+				'{DAV:}displayname',
+				'{urn:ietf:params:xml:ns:carddav}addressbook-home-set'
+			), 1);
+
+//			$this->oLogger->WriteDump($aResponse);
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger->WriteException($oException);
+		}
+
+		return $aResponse;
+	}
+
+	/**
+	 * @param \SabreForRainLoop\DAV\Client $oClient
 	 * @param string $sUser
 	 * @param string $sPassword
 	 * @param string $sProxy = ''
 	 *
+	 * @return array
+	 */
+	private function getContactsPaths(&$oClient, $sUser, $sPassword, $sProxy = '')
+	{
+		$aContactsPaths = array();
+
+		$sCurrentUserPrincipal = '';
+		$sAddressbookHomeSet = '';
+		
+//		[{DAV:}current-user-principal] => /cloud/remote.php/carddav/principals/admin/
+//		[{urn:ietf:params:xml:ns:carddav}addressbook-home-set] => /cloud/remote.php/carddav/addressbooks/admin/
+
+		if (!$oClient)
+		{
+			return $aContactsPaths;
+		}
+
+		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav');
+
+		$sNextPath = '';
+		$sFirstNextPath = '';
+		if (\is_array($aResponse))
+		{
+			foreach ($aResponse as $sKey => $aItem)
+			{
+				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+					false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+				{
+					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+					continue;
+				}
+
+				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+				{
+					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+					continue;
+				}
+
+				if (!empty($sKey))
+				{
+					$sFirstNextPath = $sKey;
+
+					$oResourceType = isset($aItem['{DAV:}resourcetype']) ? $aItem['{DAV:}resourcetype'] : null;
+					/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+					if ($oResourceType && $oResourceType->is('{DAV:}collection'))
+					{
+						$sNextPath = $sKey;
+						continue;
+					}
+				}
+			}
+
+			if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath))
+			{
+				$sNextPath = $sFirstNextPath;
+			}
+		}
+
+		if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet))
+		{
+			if (empty($sNextPath))
+			{
+				return $aContactsPaths;
+			}
+			else
+			{
+				if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
+				{
+					$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
+					if ($oClient)
+					{
+						$sNextPath = $oClient->__UrlPath__;
+					}
+					else
+					{
+						return $aContactsPaths;
+					}
+				}
+
+				$aResponse = $this->detectionPropFind($oClient, $sNextPath);
+				if (\is_array($aResponse))
+				{
+					foreach ($aResponse as $sKey => $aItem)
+					{
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+						{
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+							continue;
+						}
+
+						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
+						{
+							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+							continue;
+						}
+					}
+				}
+			}
+		}
+
+		if (empty($sAddressbookHomeSet))
+		{
+			if (empty($sCurrentUserPrincipal))
+			{
+				return $aContactsPaths;
+			}
+			else
+			{
+				if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
+				{
+					$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
+					if ($oClient)
+					{
+						$sCurrentUserPrincipal = $oClient->__UrlPath__;
+					}
+					else
+					{
+						return $aContactsPaths;
+					}
+				}
+
+				$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
+				if (\is_array($aResponse))
+				{
+					foreach ($aResponse as $sKey => $aItem)
+					{
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+						{
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+							continue;
+						}
+					}
+				}
+			}
+		}
+
+		if (empty($sAddressbookHomeSet))
+		{
+			return $aContactsPaths;
+		}
+		else
+		{
+			if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
+			{
+				$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
+				if ($oClient)
+				{
+					$sAddressbookHomeSet = $oClient->__UrlPath__;
+				}
+				else
+				{
+					return $aContactsPaths;
+				}
+			}
+
+			$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
+			if (\is_array($aResponse))
+			{
+				foreach ($aResponse as $sKey => $aItem)
+				{
+					if (!empty($sKey) && $aItem && isset($aItem['{DAV:}resourcetype']))
+					{
+						$oResourceType = $aItem['{DAV:}resourcetype'];
+						/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+
+						if ($oResourceType && $oResourceType->is('{DAV:}collection'))
+						{
+							if ($oResourceType->is('{urn:ietf:params:xml:ns:carddav}addressbook'))
+							{
+								$aContactsPaths[$sKey] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $aContactsPaths;
+	}
+
+	/**
+	 * @param \SabreForRainLoop\DAV\Client $oClient
+	 * @param string $sPath
+	 *
 	 * @return bool
 	 */
-	public function Sync($sEmail, $sUrl, $sUser, $sPassword, $sProxy = '')
+	private function checkContactsPath(&$oClient, $sPath)
 	{
-		$this->SyncDatabase();
-
-		$iUserID = $this->getUserId($sEmail);
-		if (0 >= $iUserID)
+		if (!$oClient)
 		{
 			return false;
 		}
 
+		$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+		try
+		{
+			$aResponse = $oClient->propFind($sPath, array(
+				'{DAV:}resourcetype'
+			), 1);
+
+//			$this->oLogger->WriteDump($aResponse);
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger->WriteException($oException);
+		}
+
+		$bGood = false;
+		if (\is_array($aResponse))
+		{
+			foreach ($aResponse as $sKey => $aItem)
+			{
+				if (!empty($sKey) && isset($aItem['{DAV:}resourcetype']))
+				{
+					$oResourceType = $aItem['{DAV:}resourcetype'];
+					/* @var $oResourceType \SabreForRainLoop\DAV\Property\ResourceType */
+
+					if ($oResourceType && $oResourceType->is('{DAV:}collection') &&
+						$oResourceType->is('{urn:ietf:params:xml:ns:carddav}addressbook'))
+					{
+						$bGood = true;
+					}
+				}
+			}
+		}
+
+		if ($bGood)
+		{
+			$oClient->__UrlPath__ = $sPath;
+		}
+
+		return $bGood;
+	}
+
+	public function getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		if (!\preg_match('/^http[s]?:\/\//i', $sUrl))
+		{
+			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
+			$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
+			$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
+
+			if (\preg_match('/^(google\.|dav\.fruux\.com|contacts\.icloud\.com)/i', $sUrl))
+			{
+				$sUrl = 'https://'.$sUrl;
+			}
+			else
+			{
+				$sUrl = 'http://'.$sUrl;
+			}
+		}
+
 		$aUrl = \parse_url($sUrl);
 		if (!\is_array($aUrl))
 		{
@@ -238,17 +536,117 @@ class PdoAddressBook
 			$aSettings['proxy'] = $sProxy;
 		}
 
-		$sPath = $aUrl['path'];
+		$oClient = new \SabreForRainLoop\DAV\Client($aSettings);
+		$oClient->setVerifyPeer(false);
 
-		if (!\class_exists('Sabre\DAV\Client'))
+		$oClient->__UrlPath__ = $aUrl['path'];
+
+		$this->oLogger->Write('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+
+		return $oClient;
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sUrl
+	 * @param string $sUser
+	 * @param string $sPassword
+	 * @param string $sProxy = ''
+	 *
+	 * @return bool
+	 */
+	public function getDavClient($sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		if (!\class_exists('SabreForRainLoop\DAV\Client'))
 		{
 			return false;
 		}
 
-		$oClient = new \Sabre\DAV\Client($aSettings);
-		$oClient->setVerifyPeer(false);
+		$oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy);
+		if (!$oClient)
+		{
+			return false;
+		}
 
-		$this->oLogger->Write('User: '.$aSettings['userName'].', Url: '.$sUrl, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+		$bGood = false;
+		$sPath = $oClient->__UrlPath__;
+
+		$bGood = false;
+		if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath))
+		{
+			$sNewPath = '';
+
+			$aPaths = $this->getContactsPaths($oClient, $sUser, $sPassword, $sProxy);
+			$this->oLogger->WriteDump($aPaths);
+
+			if (\is_array($aPaths))
+			{
+				if (1 < \count($aPaths))
+				{
+					foreach ($aPaths as $sKey => $sValue)
+					{
+						if (\in_array(\strtolower($sValue), array('contacts', 'default', 'addressbook', 'address book')))
+						{
+							$sNewPath = $sKey;
+							break;
+						}
+					}
+				}
+
+				if (empty($sNewPath))
+				{
+					foreach ($aPaths as $sKey => $sValue)
+					{
+						$sNewPath = $sKey;
+						break;
+					}
+				}
+			}
+
+
+			$sPath = $sNewPath;
+
+			$bGood = $this->checkContactsPath($oClient, $sPath);
+		}
+		else
+		{
+			$bGood = true;
+		}
+
+		if (!$bGood)
+		{
+			$oClient = false;
+		}
+
+		return $oClient;
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sUrl
+	 * @param string $sUser
+	 * @param string $sPassword
+	 * @param string $sProxy = ''
+	 *
+	 * @return bool
+	 */
+	public function Sync($sEmail, $sUrl, $sUser, $sPassword, $sProxy = '')
+	{
+		$this->SyncDatabase();
+
+		$iUserID = $this->getUserId($sEmail);
+		if (0 >= $iUserID)
+		{
+			return false;
+		}
+
+		$oClient = $this->getDavClient($sUrl, $sUser, $sPassword, $sProxy);
+		if (!$oClient)
+		{
+			return false;
+		}
+
+		$sPath = $oClient->__UrlPath__;
 
 		$aRemoteSyncData = $this->prepearRemoteSyncData($oClient, $sPath);
 		if (false === $aRemoteSyncData)
@@ -258,8 +656,8 @@ class PdoAddressBook
 
 		$aDatabaseSyncData = $this->prepearDatabaseSyncData($iUserID);
 
-//		$this->oLogger->WriteDump($aDatabaseSyncData);
 //		$this->oLogger->WriteDump($aRemoteSyncData);
+//		$this->oLogger->WriteDump($aDatabaseSyncData);
 
 		//+++del (from carddav)
 		foreach ($aDatabaseSyncData as $sKey => $aData)
@@ -315,10 +713,13 @@ class PdoAddressBook
 						{
 							$sExsistensBody = \trim($oResponse['body']);
 						}
+
+//						$this->oLogger->WriteDump($sExsistensBody);
 					}
 
 					$oResponse = $this->davClientRequest($oClient, 'PUT',
-						$sPath.$oContact->CardDavNameUri(), $oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n");
+						$sPath.(0 < \strlen($mExsistenRemoteID) ? $mExsistenRemoteID : $oContact->CardDavNameUri()),
+						$oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n");
 
 					if ($oResponse && isset($oResponse['headers'], $oResponse['headers']['etag']))
 					{
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index 896fbdfa7..70e76b9d8 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -193,6 +193,7 @@ class Service
 
 			$sResult .= '<!--';
 			$sResult .= ' [version:'.APP_VERSION;
+			$sResult .= '][lic:'.($this->oActions->IsOpen() ? 'agpl' : 'cc');
 			$sResult .= '][time:'.\substr(\microtime(true) - APP_START, 0, 6);
 			$sResult .= '][cached:'.($bCached ? 'true' : 'false');
 			$sResult .= '][hash:'.$aTemplateParameters['{{BaseHash}}'];
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
index 21f88162b..eab644076 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/AbstractBackend.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/AbstractBackend.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Backend;
+namespace SabreForRainLoop\CalDAV\Backend;
 
-use Sabre\VObject;
-use Sabre\CalDAV;
+use SabreForRainLoop\VObject;
+use SabreForRainLoop\CalDAV;
 
 /**
  * Abstract Calendaring backend. Extend this class to create your own backends.
@@ -70,7 +70,7 @@ abstract class AbstractBackend implements BackendInterface {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
+     * documented by \SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * Note that it is extremely likely that getCalendarObject for every path
      * returned from this method will be called almost immediately after. You
@@ -99,7 +99,7 @@ abstract class AbstractBackend implements BackendInterface {
      * time-range filter specified on a VEVENT must for instance also handle
      * recurrence rules correctly.
      * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * be found in \SabreForRainLoop\CalDAV\CalendarQueryFilter. This class is as correct
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
@@ -112,7 +112,7 @@ abstract class AbstractBackend implements BackendInterface {
         $result = array();
         $objects = $this->getCalendarObjects($calendarId);
 
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
+        $validator = new \SabreForRainLoop\CalDAV\CalendarQueryValidator();
 
         foreach($objects as $object) {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
index b8334e5d0..ddfe5d8c0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/BackendInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV\Backend;
+namespace SabreForRainLoop\CalDAV\Backend;
 
 /**
  * Every CalDAV backend must at least implement this interface.
@@ -191,7 +191,7 @@ interface BackendInterface {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
+     * documented by SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * Note that it is extremely likely that getCalendarObject for every path
      * returned from this method will be called almost immediately after. You
@@ -220,7 +220,7 @@ interface BackendInterface {
      * time-range filter specified on a VEVENT must for instance also handle
      * recurrence rules correctly.
      * A good example of how to interprete all these filters can also simply
-     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * be found in SabreForRainLoop\CalDAV\CalendarQueryFilter. This class is as correct
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/NotificationSupport.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/NotificationSupport.php
similarity index 80%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/NotificationSupport.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/NotificationSupport.php
index 50021a3e7..9ae43c8b9 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/NotificationSupport.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/NotificationSupport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV\Backend;
+namespace SabreForRainLoop\CalDAV\Backend;
 
 /**
  * Adds caldav notification support to a backend.
@@ -26,7 +26,7 @@ interface NotificationSupport extends BackendInterface {
      * Returns a list of notifications for a given principal url.
      *
      * The returned array should only consist of implementations of
-     * \Sabre\CalDAV\Notifications\INotificationType.
+     * \SabreForRainLoop\CalDAV\Notifications\INotificationType.
      *
      * @param string $principalUri
      * @return array
@@ -39,9 +39,9 @@ interface NotificationSupport extends BackendInterface {
      * This may be called by a client once it deems a notification handled.
      *
      * @param string $principalUri
-     * @param \Sabre\CalDAV\Notifications\INotificationType $notification
+     * @param \SabreForRainLoop\CalDAV\Notifications\INotificationType $notification
      * @return void
      */
-    public function deleteNotification($principalUri, \Sabre\CalDAV\Notifications\INotificationType $notification);
+    public function deleteNotification($principalUri, \SabreForRainLoop\CalDAV\Notifications\INotificationType $notification);
 
 }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/PDO.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/PDO.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/PDO.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/PDO.php
index 99130ceb1..794209d9a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/PDO.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/PDO.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV\Backend;
+namespace SabreForRainLoop\CalDAV\Backend;
 
-use Sabre\VObject;
-use Sabre\CalDAV;
-use Sabre\DAV;
+use SabreForRainLoop\VObject;
+use SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAV;
 
 /**
  * PDO CalDAV backend
@@ -175,7 +175,7 @@ class PDO extends AbstractBackend {
             $values[':components'] = 'VEVENT,VTODO';
         } else {
             if (!($properties[$sccs] instanceof CalDAV\Property\SupportedCalendarComponentSet)) {
-                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \SabreForRainLoop\CalDAV\Property\SupportedCalendarComponentSet');
             }
             $values[':components'] = implode(',',$properties[$sccs]->getValue());
         }
@@ -497,7 +497,7 @@ class PDO extends AbstractBackend {
             }
         }
         if (!$componentType) {
-            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
         }
         if ($componentType === 'VEVENT') {
             $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
@@ -572,7 +572,7 @@ class PDO extends AbstractBackend {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
+     * documented by \SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * Note that it is extremely likely that getCalendarObject for every path
      * returned from this method will be called almost immediately after. You
@@ -601,7 +601,7 @@ class PDO extends AbstractBackend {
      * time-range filter specified on a VEVENT must for instance also handle
      * recurrence rules correctly.
      * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * be found in \SabreForRainLoop\CalDAV\CalendarQueryFilter. This class is as correct
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
      *
@@ -615,7 +615,7 @@ class PDO extends AbstractBackend {
     public function calendarQuery($calendarId, array $filters) {
 
         $result = array();
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
+        $validator = new \SabreForRainLoop\CalDAV\CalendarQueryValidator();
 
         $componentType = null;
         $requirePostFilter = true;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
index 8fb2b320c..3bfcc145d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Backend/SharingSupport.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Backend/SharingSupport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV\Backend;
+namespace SabreForRainLoop\CalDAV\Backend;
 
 /**
  * Adds support for sharing features to a CalDAV server.
@@ -65,12 +65,12 @@ namespace Sabre\CalDAV\Backend;
  * change.
  * This notification is always represented by:
  *
- * Sabre\CalDAV\Notifications\Notification\Invite
+ * SabreForRainLoop\CalDAV\Notifications\Notification\Invite
  *
  * In the case of an invite, the sharee may reply with an 'accept' or
  * 'decline'. These are always represented by:
  *
- * Sabre\CalDAV\Notifications\Notification\Invite
+ * SabreForRainLoop\CalDAV\Notifications\Notification\Invite
  *
  *
  * Calendar access by sharees
@@ -156,7 +156,7 @@ namespace Sabre\CalDAV\Backend;
  * Selectively disabling publish or share feature
  * ==============================================
  *
- * If Sabre\CalDAV\Property\AllowedSharingModes is returned from
+ * If SabreForRainLoop\CalDAV\Property\AllowedSharingModes is returned from
  * getCalendarsByUser, this allows the server to specify whether either sharing,
  * or publishing is supported.
  *
@@ -202,7 +202,7 @@ interface SharingSupport extends NotificationSupport {
      * Every element in this array should have the following properties:
      *   * href - Often a mailto: address
      *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * status - See the SabreForRainLoop\CalDAV\SharingPlugin::STATUS_ constants.
      *   * readOnly - boolean
      *   * summary - Optional, a description for the share
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Calendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Calendar.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Calendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Calendar.php
index 63bd2b07a..37e2810e7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Calendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Calendar.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * This object represents a CalDAV calendar.
  *
  * A calendar can contain multiple TODO and or Events. These are represented
- * as \Sabre\CalDAV\CalendarObject objects.
+ * as \SabreForRainLoop\CalDAV\CalendarObject objects.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
@@ -103,7 +103,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
      * The contained calendar objects are for example Events or Todo's.
      *
      * @param string $name
-     * @return \Sabre\CalDAV\ICalendarObject
+     * @return \SabreForRainLoop\CalDAV\ICalendarObject
      */
     public function getChild($name) {
 
@@ -323,7 +323,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See \SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
@@ -362,7 +362,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
+     * documented by SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * @param array $filters
      * @return array
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarObject.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarObject.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarObject.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarObject.php
index 1fbb51b79..9f6b49888 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarObject.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
 /**
  * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
@@ -9,12 +9,12 @@ namespace Sabre\CalDAV;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL {
+class CalendarObject extends \SabreForRainLoop\DAV\File implements ICalendarObject, \SabreForRainLoop\DAVACL\IACL {
 
     /**
-     * Sabre\CalDAV\Backend\BackendInterface
+     * SabreForRainLoop\CalDAV\Backend\BackendInterface
      *
-     * @var Sabre\CalDAV\Backend\AbstractBackend
+     * @var SabreForRainLoop\CalDAV\Backend\AbstractBackend
      */
     protected $caldavBackend;
 
@@ -253,7 +253,7 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
      */
     public function setACL(array $acl) {
 
-        throw new \Sabre\DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
+        throw new \SabreForRainLoop\DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
 
     }
 
@@ -261,7 +261,7 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See \SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryParser.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryParser.php
similarity index 87%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryParser.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryParser.php
index c894a066e..8a3aec7f2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryParser.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryParser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\VObject;
+use SabreForRainLoop\VObject;
 
 /**
  * Parses the calendar-query report request body.
@@ -84,16 +84,16 @@ class CalendarQueryParser {
 
         $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
         if ($filter->length !== 1) {
-            throw new \Sabre\DAV\Exception\BadRequest('Only one filter element is allowed');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('Only one filter element is allowed');
         }
 
         $compFilters = $this->parseCompFilters($filter->item(0));
         if (count($compFilters)!==1) {
-            throw new \Sabre\DAV\Exception\BadRequest('There must be exactly 1 top-level comp-filter.');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('There must be exactly 1 top-level comp-filter.');
         }
 
         $this->filters = $compFilters[0];
-        $this->requestedProperties = array_keys(\Sabre\DAV\XMLUtil::parseProperties($this->dom->firstChild));
+        $this->requestedProperties = array_keys(\SabreForRainLoop\DAV\XMLUtil::parseProperties($this->dom->firstChild));
 
         $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
         if ($expand->length>0) {
@@ -132,7 +132,7 @@ class CalendarQueryParser {
                 'VFREEBUSY',
                 'VALARM',
             ))) {
-                throw new \Sabre\DAV\Exception\BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
+                throw new \SabreForRainLoop\DAV\Exception\BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
             };
 
             $result[] = $compFilter;
@@ -253,7 +253,7 @@ class CalendarQueryParser {
         }
 
         if (!is_null($start) && !is_null($end) && $end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the time-range filter');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the time-range filter');
         }
 
         return array(
@@ -273,19 +273,19 @@ class CalendarQueryParser {
 
         $start = $parentNode->getAttribute('start');
         if(!$start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "start" attribute is required for the CALDAV:expand element');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The "start" attribute is required for the CALDAV:expand element');
         }
         $start = VObject\DateTimeParser::parseDateTime($start);
 
         $end = $parentNode->getAttribute('end');
         if(!$end) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "end" attribute is required for the CALDAV:expand element');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The "end" attribute is required for the CALDAV:expand element');
         }
 
         $end = VObject\DateTimeParser::parseDateTime($end);
 
         if ($end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
+            throw new \SabreForRainLoop\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
         }
 
         return array(
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
index fd47127f2..4537d3bf5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarQueryValidator.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarQueryValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\VObject;
+use SabreForRainLoop\VObject;
 use DateTime;
 
 /**
@@ -23,7 +23,7 @@ class CalendarQueryValidator {
     /**
      * Verify if a list of filters applies to the calendar data object
      *
-     * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
+     * The list of filters must be formatted as parsed by \SabreForRainLoop\CalDAV\CalendarQueryParser
      *
      * @param VObject\Component $vObject
      * @param array $filters
@@ -273,7 +273,7 @@ class CalendarQueryValidator {
             $check = (string)$check;
         }
 
-        $isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
+        $isMatching = \SabreForRainLoop\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
 
         return ($textMatch['negate-condition'] xor $isMatching);
 
@@ -369,7 +369,7 @@ class CalendarQueryValidator {
                 }
 
             case 'VFREEBUSY' :
-                throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
+                throw new \SabreForRainLoop\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
 
             case 'COMPLETED' :
             case 'CREATED' :
@@ -383,7 +383,7 @@ class CalendarQueryValidator {
 
 
             default :
-                throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
+                throw new \SabreForRainLoop\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
 
         }
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
index 5d1ee7780..69e01b1a4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/CalendarRootNode.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/CalendarRootNode.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAVACL\PrincipalBackend;
+use SabreForRainLoop\DAVACL\PrincipalBackend;
 
 /**
  * Calendars collection
@@ -14,12 +14,12 @@ use Sabre\DAVACL\PrincipalBackend;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
+class CalendarRootNode extends \SabreForRainLoop\DAVACL\AbstractPrincipalCollection {
 
     /**
      * CalDAV backend
      *
-     * @var Sabre\CalDAV\Backend\BackendInterface
+     * @var SabreForRainLoop\CalDAV\Backend\BackendInterface
      */
     protected $caldavBackend;
 
@@ -48,7 +48,7 @@ class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
      * Returns the nodename
      *
      * We're overriding this, because the default will be the 'principalPrefix',
-     * and we want it to be Sabre\CalDAV\Plugin::CALENDAR_ROOT
+     * and we want it to be SabreForRainLoop\CalDAV\Plugin::CALENDAR_ROOT
      *
      * @return string
      */
@@ -66,7 +66,7 @@ class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
      * supplied by the authentication backend.
      *
      * @param array $principal
-     * @return \Sabre\DAV\INode
+     * @return \SabreForRainLoop\DAV\INode
      */
     public function getChildForPrincipal(array $principal) {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Exception/InvalidComponentType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Exception/InvalidComponentType.php
similarity index 89%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Exception/InvalidComponentType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Exception/InvalidComponentType.php
index b8d36794c..c7d0ea920 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Exception/InvalidComponentType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Exception/InvalidComponentType.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Exception;
+namespace SabreForRainLoop\CalDAV\Exception;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * InvalidComponentType
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICSExportPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICSExportPlugin.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICSExportPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICSExportPlugin.php
index aa0637295..6e36274ed 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICSExportPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICSExportPlugin.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAV;
-use Sabre\VObject;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\VObject;
 
 /**
  * ICS Exporter
@@ -21,14 +21,14 @@ class ICSExportPlugin extends DAV\ServerPlugin {
     /**
      * Reference to Server class
      *
-     * @var \Sabre\DAV\Server
+     * @var \SabreForRainLoop\DAV\Server
      */
     protected $server;
 
     /**
      * Initializes the plugin and registers event handlers
      *
-     * @param \Sabre\DAV\Server $server
+     * @param \SabreForRainLoop\DAV\Server $server
      * @return void
      */
     public function initialize(DAV\Server $server) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendar.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendar.php
index 8be36d35a..e6de95b55 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendar.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\CalDAV;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Calendar interface
@@ -26,7 +26,7 @@ interface ICalendar extends DAV\ICollection {
      * query.
      *
      * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
+     * documented by \SabreForRainLoop\CalDAV\CalendarQueryParser.
      *
      * @param array $filters
      * @return array
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendarObject.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendarObject.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendarObject.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendarObject.php
index 365d4009c..6b09bbb3f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ICalendarObject.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ICalendarObject.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\CalDAV;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAV;
 
 /**
  * CalendarObject interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/IShareableCalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/IShareableCalendar.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/IShareableCalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/IShareableCalendar.php
index b418eab52..8f4181379 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/IShareableCalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/IShareableCalendar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
 /**
  * This interface represents a Calendar that can be shared with other users.
@@ -37,7 +37,7 @@ interface IShareableCalendar extends ICalendar {
      * Every element in this array should have the following properties:
      *   * href - Often a mailto: address
      *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * status - See the SabreForRainLoop\CalDAV\SharingPlugin::STATUS_ constants.
      *   * readOnly - boolean
      *   * summary - Optional, a description for the share
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ISharedCalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ISharedCalendar.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ISharedCalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ISharedCalendar.php
index f9084a4f4..fae642507 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ISharedCalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ISharedCalendar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
 /**
  * This interface represents a Calendar that is shared by a different user.
@@ -25,7 +25,7 @@ interface ISharedCalendar extends ICalendar {
      * Every element in this array should have the following properties:
      *   * href - Often a mailto: address
      *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * status - See the SabreForRainLoop\CalDAV\SharingPlugin::STATUS_ constants.
      *   * readOnly - boolean
      *   * summary - Optional, a description for the share
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Collection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Collection.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Collection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Collection.php
index e86f81b59..9bd40d4af 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Collection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Collection.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications;
+namespace SabreForRainLoop\CalDAV\Notifications;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * This node represents a list of notifications.
@@ -13,7 +13,7 @@ use Sabre\DAVACL;
  * interface to allow the Notifications plugin to mark the collection
  * as a notifications collection.
  *
- * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
+ * This collection should only return SabreForRainLoop\CalDAV\Notifications\INode nodes as
  * its children.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
@@ -25,7 +25,7 @@ class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
     /**
      * The notification backend
      *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
+     * @var SabreForRainLoop\CalDAV\Backend\NotificationSupport
      */
     protected $caldavBackend;
 
@@ -156,7 +156,7 @@ class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/ICollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/ICollection.php
similarity index 75%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/ICollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/ICollection.php
index 57a2f7dfb..f145f3889 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/ICollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/ICollection.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications;
+namespace SabreForRainLoop\CalDAV\Notifications;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This node represents a list of notifications.
@@ -11,7 +11,7 @@ use Sabre\DAV;
  * interface to allow the Notifications plugin to mark the collection
  * as a notifications collection.
  *
- * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
+ * This collection should only return SabreForRainLoop\CalDAV\Notifications\INode nodes as
  * its children.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INode.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INode.php
similarity index 79%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INode.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INode.php
index 854e891dd..cc0586c86 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INode.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INode.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications;
+namespace SabreForRainLoop\CalDAV\Notifications;
 
 /**
  * This node represents a single notification.
  *
- * The signature is mostly identical to that of Sabre\DAV\IFile, but the get() method
+ * The signature is mostly identical to that of SabreForRainLoop\DAV\IFile, but the get() method
  * MUST return an xml document that matches the requirements of the
  * 'caldav-notifications.txt' spec.
  *
@@ -20,7 +20,7 @@ interface INode {
 
     /**
      * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
+     * SabreForRainLoop\CalDAV\Notifications\INotificationType classes.
      *
      * @return INotificationType
      */
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INotificationType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INotificationType.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INotificationType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INotificationType.php
index cf64eb682..ea47b330b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/INotificationType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/INotificationType.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV\Notifications;
+use SabreForRainLoop\DAV;
 
 /**
  * This interface reflects a single notification type.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Node.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Node.php
index ef0aa0c26..69ac26676 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Node.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications;
+namespace SabreForRainLoop\CalDAV\Notifications;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * This node represents a single notification.
  *
- * The signature is mostly identical to that of Sabre\DAV\IFile, but the get() method
+ * The signature is mostly identical to that of SabreForRainLoop\DAV\IFile, but the get() method
  * MUST return an xml document that matches the requirements of the
  * 'caldav-notifications.txt' spec.
 
@@ -22,14 +22,14 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
     /**
      * The notification backend
      *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
+     * @var SabreForRainLoop\CalDAV\Backend\NotificationSupport
      */
     protected $caldavBackend;
 
     /**
      * The actual notification
      *
-     * @var Sabre\CalDAV\Notifications\INotificationType
+     * @var SabreForRainLoop\CalDAV\Notifications\INotificationType
      */
     protected $notification;
 
@@ -81,7 +81,7 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
 
     /**
      * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
+     * SabreForRainLoop\CalDAV\Notifications\INotificationType classes.
      *
      * @return INotificationType
      */
@@ -175,7 +175,7 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/Invite.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/Invite.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/Invite.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/Invite.php
index 42daf3fb0..262375506 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/Invite.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/Invite.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications\Notification;
+namespace SabreForRainLoop\CalDAV\Notifications\Notification;
 
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\CalDAV\SharingPlugin as SharingPlugin;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * This class represents the cs:invite-notification notification element.
@@ -103,7 +103,7 @@ class Invite extends DAV\Property implements CalDAV\Notifications\INotificationT
     /**
      * The list of supported components
      *
-     * @var Sabre\CalDAV\Property\SupportedCalendarComponentSet
+     * @var SabreForRainLoop\CalDAV\Property\SupportedCalendarComponentSet
      */
     protected $supportedComponents;
 
@@ -127,7 +127,7 @@ class Invite extends DAV\Property implements CalDAV\Notifications\INotificationT
      *   * summary      - Description of the share, can be the same as the
      *                    calendar, but may also be modified (optional).
      *   * supportedComponents - An instance of
-     *                    Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+     *                    SabreForRainLoop\CalDAV\Property\SupportedCalendarComponentSet.
      *                    This allows the client to determine which components
      *                    will be supported in the shared calendar. This is
      *                    also optional.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/InviteReply.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/InviteReply.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/InviteReply.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/InviteReply.php
index 3654a3e16..3964c9406 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/InviteReply.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/InviteReply.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications\Notification;
+namespace SabreForRainLoop\CalDAV\Notifications\Notification;
 
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\CalDAV\SharingPlugin as SharingPlugin;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * This class represents the cs:invite-reply notification element.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/SystemStatus.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/SystemStatus.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/SystemStatus.php
index a6a1c4928..dfe571a52 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Notifications/Notification/SystemStatus.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Notifications\Notification;
+namespace SabreForRainLoop\CalDAV\Notifications\Notification;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * SystemStatus notification
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Plugin.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Plugin.php
index 084036cf9..9ed569552 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Plugin.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
-use Sabre\VObject;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
+use SabreForRainLoop\VObject;
 
 /**
  * CalDAV plugin
@@ -171,14 +171,14 @@ class Plugin extends DAV\ServerPlugin {
         $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
         $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
 
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Property\\SupportedCalendarComponentSet';
-        $server->propertyMap['{' . self::NS_CALDAV . '}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Property\\ScheduleCalendarTransp';
+        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'SabreForRainLoop\\CalDAV\\Property\\SupportedCalendarComponentSet';
+        $server->propertyMap['{' . self::NS_CALDAV . '}schedule-calendar-transp'] = 'SabreForRainLoop\\CalDAV\\Property\\ScheduleCalendarTransp';
 
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Schedule\\IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+        $server->resourceTypeMapping['\\SabreForRainLoop\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
 
         array_push($server->protectedProperties,
 
@@ -286,7 +286,7 @@ class Plugin extends DAV\ServerPlugin {
         // for clients matching iCal in the user agent
         //$ua = $this->server->httpRequest->getHeader('User-Agent');
         //if (strpos($ua,'iCal/')!==false) {
-        //    throw new \Sabre\DAV\Exception\Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
+        //    throw new \SabreForRainLoop\DAV\Exception\Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
         //}
 
         $body = $this->server->httpRequest->getBody(true);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
index 4fc70e265..e4559c878 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/Collection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/Collection.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
+namespace SabreForRainLoop\CalDAV\Principal;
+use SabreForRainLoop\DAVACL;
 
 /**
  * Principal collection
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyRead.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyRead.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyRead.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyRead.php
index a774b2aad..f2215ebe7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyRead.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyRead.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
+namespace SabreForRainLoop\CalDAV\Principal;
 
-use Sabre\DAVACL;
+use SabreForRainLoop\DAVACL;
 
 /**
  * ProxyRead principal interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyWrite.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyWrite.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyWrite.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyWrite.php
index 48c84d25d..f58d25dd7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/IProxyWrite.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/IProxyWrite.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
+namespace SabreForRainLoop\CalDAV\Principal;
 
-use Sabre\DAVACL;
+use SabreForRainLoop\DAVACL;
 
 /**
  * ProxyWrite principal interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyRead.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyRead.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyRead.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyRead.php
index 0a8bf57b0..5c8f38ab7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyRead.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyRead.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV\Principal;
+use SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 /**
  * ProxyRead principal
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyWrite.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyWrite.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyWrite.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyWrite.php
index c9b136fe0..1ebaf6a10 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/ProxyWrite.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/ProxyWrite.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV\Principal;
+use SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 /**
  * ProxyWrite principal
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/User.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/User.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/User.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/User.php
index d37ca115d..1887f8ad0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Principal/User.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Principal/User.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAV;
-use Sabre\DAVACL;
+namespace SabreForRainLoop\CalDAV\Principal;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * CalDAV principal
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/AllowedSharingModes.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/AllowedSharingModes.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/AllowedSharingModes.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/AllowedSharingModes.php
index 5284baf3a..97b888a0d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/AllowedSharingModes.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/AllowedSharingModes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
+namespace SabreForRainLoop\CalDAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * AllowedSharingModes
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/Invite.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/Invite.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/Invite.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/Invite.php
index e955e5f1c..7a8683acb 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/Invite.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/Invite.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
+namespace SabreForRainLoop\CalDAV\Property;
 
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\CalDAV\SharingPlugin as SharingPlugin;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * Invite property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/ScheduleCalendarTransp.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/ScheduleCalendarTransp.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/ScheduleCalendarTransp.php
index 967c5e22a..328ac764a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/ScheduleCalendarTransp.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
+namespace SabreForRainLoop\CalDAV\Property;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * schedule-calendar-transp property.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarComponentSet.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarComponentSet.php
index 84c66c913..c533762e7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
+namespace SabreForRainLoop\CalDAV\Property;
 
-use Sabre\DAV;
-use Sabre\CalDAV;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
 
 /**
  * Supported component set property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarData.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarData.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarData.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarData.php
index ab989e831..ed742daf3 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCalendarData.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
-use Sabre\DAV;
-use Sabre\CalDAV\Plugin;
+namespace SabreForRainLoop\CalDAV\Property;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV\Plugin;
 
 /**
  * Supported-calendar-data property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCollationSet.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCollationSet.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCollationSet.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCollationSet.php
index cefc3d3bd..7c853f26c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Property/SupportedCollationSet.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\CalDAV\Property;
-use Sabre\DAV;
+namespace SabreForRainLoop\CalDAV\Property;
+use SabreForRainLoop\DAV;
 
 /**
  * supported-collation-set property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IMip.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IMip.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IMip.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IMip.php
index 2a6c5f360..0efacff6a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IMip.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IMip.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Schedule;
+namespace SabreForRainLoop\CalDAV\Schedule;
 
-use Sabre\VObject;
-use Sabre\DAV;
+use SabreForRainLoop\VObject;
+use SabreForRainLoop\DAV;
 
 /**
  * iMIP handler.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IOutbox.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IOutbox.php
similarity index 69%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IOutbox.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IOutbox.php
index 55a70bd34..e9edc5105 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/IOutbox.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/IOutbox.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV\Schedule;
+namespace SabreForRainLoop\CalDAV\Schedule;
 
 /**
  * Implement this interface to have a node be recognized as a CalDAV scheduling
@@ -10,7 +10,7 @@ namespace Sabre\CalDAV\Schedule;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-interface IOutbox extends \Sabre\DAV\ICollection, \Sabre\DAVACL\IACL {
+interface IOutbox extends \SabreForRainLoop\DAV\ICollection, \SabreForRainLoop\DAVACL\IACL {
 
 
 }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/Outbox.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/Outbox.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/Outbox.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/Outbox.php
index d05889f35..15ad15940 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Schedule/Outbox.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Schedule/Outbox.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV\Schedule;
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
+namespace SabreForRainLoop\CalDAV\Schedule;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CalDAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * The CalDAV scheduling outbox
@@ -52,7 +52,7 @@ class Outbox extends DAV\Collection implements IOutbox {
     /**
      * Returns an array with all the child nodes
      *
-     * @return \Sabre\DAV\INode[]
+     * @return \SabreForRainLoop\DAV\INode[]
      */
     public function getChildren() {
 
@@ -138,7 +138,7 @@ class Outbox extends DAV\Collection implements IOutbox {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ShareableCalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ShareableCalendar.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ShareableCalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ShareableCalendar.php
index 47e098847..43b051a21 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/ShareableCalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/ShareableCalendar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
 /**
  * This object represents a CalDAV calendar that can be shared with other
@@ -42,7 +42,7 @@ class ShareableCalendar extends Calendar implements IShareableCalendar {
      * Every element in this array should have the following properties:
      *   * href - Often a mailto: address
      *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * status - See the SabreForRainLoop\CalDAV\SharingPlugin::STATUS_ constants.
      *   * readOnly - boolean
      *   * summary - Optional, a description for the share
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharedCalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharedCalendar.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharedCalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharedCalendar.php
index 7641289dd..fda75159b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharedCalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharedCalendar.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAVACL;
+use SabreForRainLoop\DAVACL;
 
 /**
  * This object represents a CalDAV calendar that is shared by a different user.
@@ -101,7 +101,7 @@ class SharedCalendar extends Calendar implements ISharedCalendar {
      * Every element in this array should have the following properties:
      *   * href - Often a mailto: address
      *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * status - See the SabreForRainLoop\CalDAV\SharingPlugin::STATUS_ constants.
      *   * readOnly - boolean
      *   * summary - Optional, a description for the share
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharingPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharingPlugin.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharingPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharingPlugin.php
index c37571706..7a89075a0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/SharingPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/SharingPlugin.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This plugin implements support for caldav sharing.
@@ -11,7 +11,7 @@ use Sabre\DAV;
  * http://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk/doc/Extensions/caldav-sharing.txt
  *
  * See:
- * Sabre\CalDAV\Backend\SharingSupport for all the documentation.
+ * SabreForRainLoop\CalDAV\Backend\SharingSupport for all the documentation.
  *
  * Note: This feature is experimental, and may change in between different
  * SabreDAV versions.
@@ -34,7 +34,7 @@ class SharingPlugin extends DAV\ServerPlugin {
     /**
      * Reference to SabreDAV server object.
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -56,7 +56,7 @@ class SharingPlugin extends DAV\ServerPlugin {
      * Returns a plugin name.
      *
      * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
+     * using SabreForRainLoop\DAV\Server::getPlugin
      *
      * @return string
      */
@@ -69,7 +69,7 @@ class SharingPlugin extends DAV\ServerPlugin {
     /**
      * This initializes the plugin.
      *
-     * This function is called by Sabre\DAV\Server, after
+     * This function is called by SabreForRainLoop\DAV\Server, after
      * addPlugin is called.
      *
      * This method should set up the required event subscriptions.
@@ -80,7 +80,7 @@ class SharingPlugin extends DAV\ServerPlugin {
     public function initialize(DAV\Server $server) {
 
         $this->server = $server;
-        $server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
+        $server->resourceTypeMapping['SabreForRainLoop\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
 
         array_push(
             $this->server->protectedProperties,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
index a3be4fdd3..17f7956f0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/UserCalendars.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/UserCalendars.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * The UserCalenders class contains all calendars associated to one user
@@ -17,7 +17,7 @@ class UserCalendars implements DAV\IExtendedCollection, DAVACL\IACL {
     /**
      * CalDAV backend
      *
-     * @var Sabre\CalDAV\Backend\BackendInterface
+     * @var SabreForRainLoop\CalDAV\Backend\BackendInterface
      */
     protected $caldavBackend;
 
@@ -302,7 +302,7 @@ class UserCalendars implements DAV\IExtendedCollection, DAVACL\IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Version.php
similarity index 78%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Version.php
index 5f305820a..b85b34006 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CalDAV/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CalDAV/Version.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CalDAV;
+namespace SabreForRainLoop\CalDAV;
 
 /**
- * This class contains the Sabre\CalDAV version constants.
+ * This class contains the SabreForRainLoop\CalDAV version constants.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBook.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBook.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBook.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBook.php
index 85b301cb8..1c6103976 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBook.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * The AddressBook class represents a CardDAV addressbook, owned by a specific user
@@ -298,7 +298,7 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookQueryParser.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookQueryParser.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookQueryParser.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookQueryParser.php
index 2b5cd209d..579937e82 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookQueryParser.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookQueryParser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Parses the addressbook-query report request body.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookRoot.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookRoot.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookRoot.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookRoot.php
index acee40efc..5cbd91835 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/AddressBookRoot.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/AddressBookRoot.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAVACL;
+use SabreForRainLoop\DAVACL;
 
 /**
  * AddressBook rootnode
@@ -18,7 +18,7 @@ class AddressBookRoot extends DAVACL\AbstractPrincipalCollection {
     /**
      * Principal Backend
      *
-     * @var Sabre\DAVACL\PrincipalBackend\BackendInteface
+     * @var SabreForRainLoop\DAVACL\PrincipalBackend\BackendInteface
      */
     protected $principalBackend;
 
@@ -69,7 +69,7 @@ class AddressBookRoot extends DAVACL\AbstractPrincipalCollection {
      * supplied by the authentication backend.
      *
      * @param array $principal
-     * @return \Sabre\DAV\INode
+     * @return \SabreForRainLoop\DAV\INode
      */
     public function getChildForPrincipal(array $principal) {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/AbstractBackend.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/AbstractBackend.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/AbstractBackend.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/AbstractBackend.php
index 363b73afa..14504d6fa 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/AbstractBackend.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/AbstractBackend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CardDAV\Backend;
+namespace SabreForRainLoop\CardDAV\Backend;
 
 /**
  * CardDAV abstract Backend
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/BackendInterface.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/BackendInterface.php
index c4607c217..db793861e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/BackendInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CardDAV\Backend;
+namespace SabreForRainLoop\CardDAV\Backend;
 
 /**
  * CardDAV Backend Interface
@@ -39,12 +39,12 @@ interface BackendInterface {
     /**
      * Updates an addressbook's properties
      *
-     * See Sabre\DAV\IProperties for a description of the mutations array, as
+     * See SabreForRainLoop\DAV\IProperties for a description of the mutations array, as
      * well as the return value.
      *
      * @param mixed $addressBookId
      * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
+     * @see SabreForRainLoop\DAV\IProperties::updateProperties
      * @return bool|array
      */
     public function updateAddressBook($addressBookId, array $mutations);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/PDO.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/PDO.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/PDO.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/PDO.php
index 014aeb491..545420cb6 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Backend/PDO.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Backend/PDO.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV\Backend;
+namespace SabreForRainLoop\CardDAV\Backend;
 
-use Sabre\CardDAV;
-use Sabre\DAV;
+use SabreForRainLoop\CardDAV;
+use SabreForRainLoop\DAV;
 
 /**
  * PDO CardDAV backend
@@ -84,12 +84,12 @@ class PDO extends AbstractBackend {
     /**
      * Updates an addressbook's properties
      *
-     * See Sabre\DAV\IProperties for a description of the mutations array, as
+     * See SabreForRainLoop\DAV\IProperties for a description of the mutations array, as
      * well as the return value.
      *
      * @param mixed $addressBookId
      * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
+     * @see SabreForRainLoop\DAV\IProperties::updateProperties
      * @return bool|array
      */
     public function updateAddressBook($addressBookId, array $mutations) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Card.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Card.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Card.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Card.php
index 93ad7d2ac..dba09ec6d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Card.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Card.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAVACL;
-use Sabre\DAV;
+use SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 
 /**
@@ -242,7 +242,7 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IAddressBook.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IAddressBook.php
similarity index 85%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IAddressBook.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IAddressBook.php
index ebb8e2b63..a8d74c6bb 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IAddressBook.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IAddressBook.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * AddressBook interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/ICard.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/ICard.php
similarity index 85%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/ICard.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/ICard.php
index f12ad9a1d..39e607f70 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/ICard.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/ICard.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Card interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IDirectory.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IDirectory.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IDirectory.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IDirectory.php
index f0cfd59a0..5f20a7398 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/IDirectory.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/IDirectory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
 /**
  * IDirectory interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Plugin.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Plugin.php
index 7d8d80fd3..d61e7dcfa 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Plugin.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
-use Sabre\VObject;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
+use SabreForRainLoop\VObject;
 
 /**
  * CardDAV plugin
@@ -38,7 +38,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -64,8 +64,8 @@ class Plugin extends DAV\ServerPlugin {
         $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
 
         /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
+        $server->resourceTypeMapping['SabreForRainLoop\\CardDAV\\IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
+        $server->resourceTypeMapping['SabreForRainLoop\\CardDAV\\IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
 
         /* Adding properties that may never be changed */
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
@@ -73,7 +73,7 @@ class Plugin extends DAV\ServerPlugin {
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
         $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
 
-        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Property\\Href';
+        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'SabreForRainLoop\\DAV\\Property\\Href';
 
         $this->server = $server;
 
@@ -654,7 +654,7 @@ class Plugin extends DAV\ServerPlugin {
 
     /**
      * This method is used to generate HTML output for the
-     * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
+     * SabreForRainLoop\DAV\Browser\Plugin. This allows us to generate an interface users
      * can use to create new calendars.
      *
      * @param DAV\INode $node
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
index b2bb6b551..084c06f32 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Property/SupportedAddressData.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Property/SupportedAddressData.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV\Property;
+namespace SabreForRainLoop\CardDAV\Property;
 
-use Sabre\DAV;
-use Sabre\CardDAV;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\CardDAV;
 
 /**
  * Supported-address-data property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/UserAddressBooks.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/UserAddressBooks.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/UserAddressBooks.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/UserAddressBooks.php
index dca465b9e..0970fe3da 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/UserAddressBooks.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/UserAddressBooks.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * UserAddressBooks class
@@ -243,7 +243,7 @@ class UserAddressBooks extends DAV\Collection implements DAV\IExtendedCollection
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/VCFExportPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/VCFExportPlugin.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/VCFExportPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/VCFExportPlugin.php
index b1e6f5e48..081bdd22c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/VCFExportPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/VCFExportPlugin.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
-use Sabre\DAV;
-use Sabre\VObject;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\VObject;
 
 /**
  * VCF Exporter
@@ -22,7 +22,7 @@ class VCFExportPlugin extends DAV\ServerPlugin {
     /**
      * Reference to Server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Version.php
similarity index 79%
rename from rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Version.php
index 9b691423c..d3ce9816d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/CardDAV/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/CardDAV/Version.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sabre\CardDAV;
+namespace SabreForRainLoop\CardDAV;
 
 /**
  * Version Class
  *
- * This class contains the Sabre\CardDAV version information
+ * This class contains the SabreForRainLoop\CardDAV version information
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractBasic.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractBasic.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractBasic.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractBasic.php
index daa8bd8ad..4638a692c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractBasic.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
+namespace SabreForRainLoop\DAV\Auth\Backend;
 
-use Sabre\DAV;
-use Sabre\HTTP;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\HTTP;
 
 /**
  * HTTP Basic authentication backend class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractDigest.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractDigest.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractDigest.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractDigest.php
index 14993a014..ca642c6c2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/AbstractDigest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
+namespace SabreForRainLoop\DAV\Auth\Backend;
 
-use Sabre\HTTP;
-use Sabre\DAV;
+use SabreForRainLoop\HTTP;
+use SabreForRainLoop\DAV;
 
 /**
  * HTTP Digest authentication backend class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/Apache.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/Apache.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/Apache.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/Apache.php
index bdde16716..be19a6810 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/Apache.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/Apache.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAV\Auth\Backend;
+use SabreForRainLoop\DAV;
 
 /**
  * Apache authenticator
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/BackendInterface.php
similarity index 82%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/BackendInterface.php
index 140adaa2e..1193489d4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/BackendInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
+namespace SabreForRainLoop\DAV\Auth\Backend;
 
 /**
  * This is the base class for any authentication object.
@@ -17,11 +17,11 @@ interface BackendInterface {
      * If authentication is successful, true must be returned.
      * If authentication fails, an exception must be thrown.
      *
-     * @param \Sabre\DAV\Server $server
+     * @param \SabreForRainLoop\DAV\Server $server
      * @param string $realm
      * @return bool
      */
-    function authenticate(\Sabre\DAV\Server $server,$realm);
+    function authenticate(\SabreForRainLoop\DAV\Server $server,$realm);
 
     /**
      * Returns information about the currently logged in username.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/File.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/File.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/File.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/File.php
index c325b1e5b..515fe3648 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/File.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
+namespace SabreForRainLoop\DAV\Auth\Backend;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This is an authentication backend that uses a file to manage passwords.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/PDO.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/PDO.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/PDO.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/PDO.php
index 1bc6699b7..7e8e31d6c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Backend/PDO.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Backend/PDO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Auth\Backend;
+namespace SabreForRainLoop\DAV\Auth\Backend;
 
 /**
  * This is an authentication backend that uses a file to manage passwords.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Plugin.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Plugin.php
index fccbcc22f..ade6a5f75 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Auth/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Auth/Plugin.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAV\Auth;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAV\Auth;
+use SabreForRainLoop\DAV;
 
 /**
  * This plugin provides Authentication for a WebDAV server.
@@ -21,7 +21,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to main server object
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -100,7 +100,7 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param string $method
      * @param string $uri
-     * @throws Sabre\DAV\Exception\NotAuthenticated
+     * @throws SabreForRainLoop\DAV\Exception\NotAuthenticated
      * @return bool
      */
     public function beforeMethod($method, $uri) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/GuessContentType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/GuessContentType.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/GuessContentType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/GuessContentType.php
index 36c63f515..c787fdda2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/GuessContentType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/GuessContentType.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Browser;
+namespace SabreForRainLoop\DAV\Browser;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * GuessContentType plugin
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/MapGetToPropFind.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/MapGetToPropFind.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/MapGetToPropFind.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/MapGetToPropFind.php
index a429e8f88..3792252b0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/MapGetToPropFind.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/MapGetToPropFind.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Browser;
+namespace SabreForRainLoop\DAV\Browser;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This is a simple plugin that will map any GET request for non-files to
@@ -19,7 +19,7 @@ class MapGetToPropFind extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/Plugin.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/Plugin.php
index 5fefc7ee2..d19ba58ea 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/Plugin.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Browser;
+namespace SabreForRainLoop\DAV\Browser;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Browser Plugin
@@ -31,12 +31,12 @@ class Plugin extends DAV\ServerPlugin {
      * @var array
      */
     public $iconMap = array(
-        'Sabre\\DAV\\IFile' => 'icons/file',
-        'Sabre\\DAV\\ICollection' => 'icons/collection',
-        'Sabre\\DAVACL\\IPrincipal' => 'icons/principal',
-        'Sabre\\CalDAV\\ICalendar' => 'icons/calendar',
-        'Sabre\\CardDAV\\IAddressBook' => 'icons/addressbook',
-        'Sabre\\CardDAV\\ICard' => 'icons/card',
+        'SabreForRainLoop\\DAV\\IFile' => 'icons/file',
+        'SabreForRainLoop\\DAV\\ICollection' => 'icons/collection',
+        'SabreForRainLoop\\DAVACL\\IPrincipal' => 'icons/principal',
+        'SabreForRainLoop\\CalDAV\\ICalendar' => 'icons/calendar',
+        'SabreForRainLoop\\CardDAV\\IAddressBook' => 'icons/addressbook',
+        'SabreForRainLoop\\CardDAV\\ICard' => 'icons/card',
     );
 
     /**
@@ -49,7 +49,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -400,7 +400,7 @@ class Plugin extends DAV\ServerPlugin {
 
         // We also know fairly certain that if an object is a non-extended
         // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node)==='Sabre\\DAV\\SimpleCollection')
+        if (get_class($node)==='SabreForRainLoop\\DAV\\SimpleCollection')
             return;
 
         $output.= '<tr><td colspan="2"><form method="post" action="">
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/favicon.ico b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/favicon.ico
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/favicon.ico
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/favicon.ico
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/addressbook.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/addressbook.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/addressbook.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/addressbook.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/calendar.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/calendar.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/calendar.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/calendar.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/card.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/card.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/card.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/card.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/collection.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/collection.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/collection.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/collection.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/file.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/file.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/file.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/file.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/parent.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/parent.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/parent.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/parent.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/principal.png b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/principal.png
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Browser/assets/icons/principal.png
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Browser/assets/icons/principal.png
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
index e2831bf70..8941d74cb 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * SabreDAV DAV client
@@ -24,7 +24,7 @@ class Client {
      * respective class.
      *
      * The {DAV:}resourcetype property is automatically added. This maps to
-     * Sabre\DAV\Property\ResourceType
+     * SabreForRainLoop\DAV\Property\ResourceType
      *
      * @var array
      */
@@ -103,7 +103,7 @@ class Client {
             $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
         }
 
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre\\DAV\\Property\\ResourceType';
+        $this->propertyMap['{DAV:}resourcetype'] = 'SabreForRainLoop\\DAV\\Property\\ResourceType';
 
     }
 
@@ -376,6 +376,9 @@ class Client {
             $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
         }
 
+//		var_dump($url);
+//		var_dump($curlSettings);
+
         list(
             $response,
             $curlInfo,
@@ -383,9 +386,12 @@ class Client {
             $curlError
         ) = $this->curlRequest($url, $curlSettings);
 
+//		var_dump($response);
+
         $headerBlob = substr($response, 0, $curlInfo['header_size']);
         $response = substr($response, $curlInfo['header_size']);
 
+
         // In the case of 100 Continue, or redirects we'll have multiple lists
         // of headers for each separate HTTP response. We can easily split this
         // because they are separated by \r\n\r\n
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
index d8d5265b9..1e070e76c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Collection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Collection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Collection class
@@ -21,7 +21,7 @@ abstract class Collection extends Node implements ICollection {
      * nodes, and compares the name.
      * Generally its wise to override this, as this can usually be optimized
      *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * This method must throw SabreForRainLoop\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception.php
index 9c7a985b4..7140bdf4b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception.php
@@ -10,7 +10,7 @@
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Main Exception class.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/BadRequest.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/BadRequest.php
similarity index 82%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/BadRequest.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/BadRequest.php
index bcf4c8eb4..0b6c4917c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/BadRequest.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/BadRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * BadRequest
@@ -12,7 +12,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class BadRequest extends \Sabre\DAV\Exception {
+class BadRequest extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Conflict.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Conflict.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Conflict.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Conflict.php
index 2c8fa8167..9046a2fb0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Conflict.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Conflict.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * Conflict
@@ -12,7 +12,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class Conflict extends \Sabre\DAV\Exception {
+class Conflict extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ConflictingLock.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ConflictingLock.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ConflictingLock.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ConflictingLock.php
index ba66f243d..947d7cf87 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ConflictingLock.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ConflictingLock.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * ConflictingLock
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/FileNotFound.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/FileNotFound.php
similarity index 63%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/FileNotFound.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/FileNotFound.php
index da700ebb0..24a0e64fe 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/FileNotFound.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/FileNotFound.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * FileNotFound
  *
  * Deprecated: Warning, this class is deprecated and will be removed in a
- * future version of SabreDAV. Please use Sabre\DAV\Exception\NotFound instead.
+ * future version of SabreDAV. Please use SabreForRainLoop\DAV\Exception\NotFound instead.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
- * @deprecated Use Sabre\DAV\Exception\NotFound instead
+ * @deprecated Use SabreForRainLoop\DAV\Exception\NotFound instead
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
 class FileNotFound extends NotFound {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Forbidden.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Forbidden.php
similarity index 82%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Forbidden.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Forbidden.php
index 3c9a46677..f9fd46d7c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Forbidden.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Forbidden.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * Forbidden
@@ -11,7 +11,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class Forbidden extends \Sabre\DAV\Exception {
+class Forbidden extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InsufficientStorage.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InsufficientStorage.php
similarity index 81%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InsufficientStorage.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InsufficientStorage.php
index 8505ce17f..60994d966 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InsufficientStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InsufficientStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * InsufficientStorage
@@ -11,7 +11,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class InsufficientStorage extends \Sabre\DAV\Exception {
+class InsufficientStorage extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InvalidResourceType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InvalidResourceType.php
similarity index 86%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InvalidResourceType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InvalidResourceType.php
index ce64f2ee0..05e6d0249 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/InvalidResourceType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/InvalidResourceType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * InvalidResourceType
@@ -23,7 +23,7 @@ class InvalidResourceType extends Forbidden {
      * @param \DOMElement $errorNode
      * @return void
      */
-    public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+    public function serialize(\SabreForRainLoop\DAV\Server $server,\DOMElement $errorNode) {
 
         $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
         $errorNode->appendChild($error);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
index a8f8407f0..6fbd28891 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * LockTokenMatchesRequestUri
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Locked.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Locked.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Locked.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Locked.php
index 2f8460be2..ebcc46c5b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/Locked.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/Locked.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Locked
@@ -18,7 +18,7 @@ class Locked extends DAV\Exception {
     /**
      * Lock information
      *
-     * @var Sabre\DAV\Locks\LockInfo
+     * @var SabreForRainLoop\DAV\Locks\LockInfo
      */
     protected $lock;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/MethodNotAllowed.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/MethodNotAllowed.php
similarity index 78%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/MethodNotAllowed.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/MethodNotAllowed.php
index 09aeca4c8..0c2b67eb1 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/MethodNotAllowed.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/MethodNotAllowed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * MethodNotAllowed
@@ -11,7 +11,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class MethodNotAllowed extends \Sabre\DAV\Exception {
+class MethodNotAllowed extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
@@ -29,10 +29,10 @@ class MethodNotAllowed extends \Sabre\DAV\Exception {
      *
      * The headers must be returned as an array.
      *
-     * @param \Sabre\DAV\Server $server
+     * @param \SabreForRainLoop\DAV\Server $server
      * @return array
      */
-    public function getHTTPHeaders(\Sabre\DAV\Server $server) {
+    public function getHTTPHeaders(\SabreForRainLoop\DAV\Server $server) {
 
         $methods = $server->getAllowedMethods($server->getRequestUri());
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
index 695edda15..99e2ad262 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotAuthenticated.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotAuthenticated.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * NotAuthenticated
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotFound.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotFound.php
similarity index 83%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotFound.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotFound.php
index 605c650a4..78786a9b5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotFound.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotFound.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * NotFound
@@ -11,7 +11,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class NotFound extends \Sabre\DAV\Exception {
+class NotFound extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotImplemented.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotImplemented.php
similarity index 82%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotImplemented.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotImplemented.php
index 6934a53e5..70e01d604 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/NotImplemented.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/NotImplemented.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * NotImplemented
@@ -11,7 +11,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class NotImplemented extends \Sabre\DAV\Exception {
+class NotImplemented extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * Returns the HTTP statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PaymentRequired.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PaymentRequired.php
similarity index 89%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PaymentRequired.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PaymentRequired.php
index ad053fd79..251c05f7f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PaymentRequired.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PaymentRequired.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Payment Required
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PreconditionFailed.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PreconditionFailed.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PreconditionFailed.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PreconditionFailed.php
index 225b99a36..3a94c5a45 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/PreconditionFailed.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/PreconditionFailed.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * PreconditionFailed
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ReportNotSupported.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ReportNotSupported.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ReportNotSupported.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ReportNotSupported.php
index d55c99bd0..d7fa05fb7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ReportNotSupported.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ReportNotSupported.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * ReportNotSupported
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/RequestedRangeNotSatisfiable.php
similarity index 89%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/RequestedRangeNotSatisfiable.php
index 0a8a85808..2080388ce 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * RequestedRangeNotSatisfiable
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ServiceUnavailable.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ServiceUnavailable.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ServiceUnavailable.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ServiceUnavailable.php
index dca764899..5fc6dca1e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/ServiceUnavailable.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/ServiceUnavailable.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * ServiceUnavailable
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/UnsupportedMediaType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/UnsupportedMediaType.php
similarity index 83%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/UnsupportedMediaType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/UnsupportedMediaType.php
index 38f5a9fac..05b245d91 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Exception/UnsupportedMediaType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Exception;
+namespace SabreForRainLoop\DAV\Exception;
 
 /**
  * UnSupportedMediaType
@@ -12,7 +12,7 @@ namespace Sabre\DAV\Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class UnsupportedMediaType extends \Sabre\DAV\Exception {
+class UnsupportedMediaType extends \SabreForRainLoop\DAV\Exception {
 
     /**
      * returns the http statuscode for this exception
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Directory.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Directory.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Directory.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Directory.php
index 333492d17..cf2a8c651 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Directory.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Directory.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAV\FS;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAV\FS;
+use SabreForRainLoop\DAV;
 
 /**
  * Directory class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/File.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/File.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/File.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/File.php
index 437a4dd78..36106deae 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/File.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\FS;
+namespace SabreForRainLoop\DAV\FS;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * File class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Node.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Node.php
index 4f52e1683..0e2145bb3 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FS/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FS/Node.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\FS;
+namespace SabreForRainLoop\DAV\FS;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Base node-class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Directory.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Directory.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Directory.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Directory.php
index c27ad5ba5..ca26db09c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Directory.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Directory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\FSExt;
+namespace SabreForRainLoop\DAV\FSExt;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Directory class
@@ -66,7 +66,7 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota {
     /**
      * Returns a specific child node, referenced by its name
      *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * This method must throw SabreForRainLoop\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/File.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/File.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/File.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/File.php
index 402195757..425637cef 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/File.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/File.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAV\FSExt;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAV\FSExt;
+use SabreForRainLoop\DAV;
 
 /**
  * File class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Node.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Node.php
index 4fb6c9a9a..17cd32c81 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/FSExt/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/FSExt/Node.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\FSExt;
+namespace SabreForRainLoop\DAV\FSExt;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Base node-class
@@ -19,7 +19,7 @@ abstract class Node extends DAV\FS\Node implements DAV\IProperties {
      * Updates properties on this node,
      *
      * @param array $properties
-     * @see Sabre\DAV\IProperties::updateProperties
+     * @see SabreForRainLoop\DAV\IProperties::updateProperties
      * @return bool|array
      */
     public function updateProperties($properties) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/File.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/File.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/File.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/File.php
index 10f56c540..e21d240b4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/File.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/File.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * File class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ICollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ICollection.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/ICollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ICollection.php
index 3f26c1245..9ae9273d3 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ICollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ICollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * The ICollection Interface
@@ -50,7 +50,7 @@ interface ICollection extends INode {
     /**
      * Returns a specific child node, referenced by its name
      *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * This method must throw SabreForRainLoop\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IExtendedCollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IExtendedCollection.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/IExtendedCollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IExtendedCollection.php
index 50ae3f4d2..88eecf81c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IExtendedCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IExtendedCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * The IExtendedCollection interface.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IFile.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IFile.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/IFile.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IFile.php
index 025b0213d..5fa1e4949 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IFile.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * This interface represents a file in the directory tree
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/INode.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/INode.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/INode.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/INode.php
index c3f3c4abd..feb121828 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/INode.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/INode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * The INode interface is the base interface, and the parent class of both ICollection and IFile
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IProperties.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IProperties.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/IProperties.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IProperties.php
index 5e0124549..7ec159f02 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IProperties.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IProperties.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * IProperties interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IQuota.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IQuota.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/IQuota.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IQuota.php
index 463c0f0db..dd42fc51f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/IQuota.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/IQuota.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * IQuota interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/AbstractBackend.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/AbstractBackend.php
similarity index 86%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/AbstractBackend.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/AbstractBackend.php
index 78fa8aa9a..c423bf022 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/AbstractBackend.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/AbstractBackend.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+namespace SabreForRainLoop\DAV\Locks\Backend;
 
-use Sabre\DAV\Locks;
+use SabreForRainLoop\DAV\Locks;
 
 /**
  * This is an Abstract clas for lock backends.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/BackendInterface.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/BackendInterface.php
index 7665a10b5..4a963840d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/BackendInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+namespace SabreForRainLoop\DAV\Locks\Backend;
 
-use Sabre\DAV\Locks;
+use SabreForRainLoop\DAV\Locks;
 
 /**
  * If you are defining your own Locks backend, you must implement this
@@ -15,7 +15,7 @@ use Sabre\DAV\Locks;
 interface BackendInterface {
 
     /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
+     * Returns a list of SabreForRainLoop\DAV\Locks\LockInfo objects
      *
      * This method should return all the locks for a particular uri, including
      * locks that might be set on a parent uri.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/FS.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/FS.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/FS.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/FS.php
index b77d8b5af..37604a8c6 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/FS.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/FS.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+namespace SabreForRainLoop\DAV\Locks\Backend;
 
-use Sabre\DAV\Locks\LockInfo;
+use SabreForRainLoop\DAV\Locks\LockInfo;
 
 /**
  * This Lock Backend stores all its data in the filesystem in separate file per
@@ -44,7 +44,7 @@ class FS extends AbstractBackend {
 
 
     /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
+     * Returns a list of SabreForRainLoop\DAV\Locks\LockInfo objects
      *
      * This method should return all the locks for a particular uri, including
      * locks that might be set on a parent uri.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/File.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/File.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/File.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/File.php
index 22d31e347..b40508591 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/File.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+namespace SabreForRainLoop\DAV\Locks\Backend;
 
-use Sabre\DAV\Locks\LockInfo;
+use SabreForRainLoop\DAV\Locks\LockInfo;
 
 /**
  * The Lock manager allows you to handle all file-locks centrally.
@@ -37,7 +37,7 @@ class File extends AbstractBackend {
     }
 
     /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
+     * Returns a list of SabreForRainLoop\DAV\Locks\LockInfo objects
      *
      * This method should return all the locks for a particular uri, including
      * locks that might be set on a parent uri.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/PDO.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/PDO.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/PDO.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/PDO.php
index cb9f633cc..271853339 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Backend/PDO.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Backend/PDO.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+namespace SabreForRainLoop\DAV\Locks\Backend;
 
-use Sabre\DAV\Locks\LockInfo;
+use SabreForRainLoop\DAV\Locks\LockInfo;
 
 /**
  * The Lock manager allows you to handle all file-locks centrally.
@@ -44,7 +44,7 @@ class PDO extends AbstractBackend {
     }
 
     /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
+     * Returns a list of SabreForRainLoop\DAV\Locks\LockInfo objects
      *
      * This method should return all the locks for a particular uri, including
      * locks that might be set on a parent uri.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/LockInfo.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/LockInfo.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/LockInfo.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/LockInfo.php
index f7178a819..894ac574d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/LockInfo.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/LockInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Locks;
+namespace SabreForRainLoop\DAV\Locks;
 
 /**
  * LockInfo class
@@ -65,7 +65,7 @@ class LockInfo {
     public $scope = self::EXCLUSIVE;
 
     /**
-     * Depth of lock, can be 0 or Sabre\DAV\Server::DEPTH_INFINITY
+     * Depth of lock, can be 0 or SabreForRainLoop\DAV\Server::DEPTH_INFINITY
      */
     public $depth = 0;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Plugin.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Plugin.php
index ece363e1b..deb73979e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Locks/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Locks/Plugin.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Locks;
+namespace SabreForRainLoop\DAV\Locks;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Locking plugin
@@ -10,8 +10,8 @@ use Sabre\DAV;
  * This plugin provides locking support to a WebDAV server.
  * The easiest way to get started, is by hooking it up as such:
  *
- * $lockBackend = new Sabre\DAV\Locks\Backend\File('./mylockdb');
- * $lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
+ * $lockBackend = new SabreForRainLoop\DAV\Locks\Backend\File('./mylockdb');
+ * $lockPlugin = new SabreForRainLoop\DAV\Locks\Plugin($lockBackend);
  * $server->addPlugin($lockPlugin);
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
@@ -30,7 +30,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * server
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -66,7 +66,7 @@ class Plugin extends DAV\ServerPlugin {
      * Returns a plugin name.
      *
      * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
+     * using SabreForRainLoop\DAV\Server::getPlugin
      *
      * @return string
      */
@@ -216,7 +216,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Returns all lock information on a particular uri
      *
-     * This function should return an array with Sabre\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
+     * This function should return an array with SabreForRainLoop\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
      *
      * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
      * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
@@ -449,7 +449,7 @@ class Plugin extends DAV\ServerPlugin {
      * It will check if the requested url is locked, and see if the correct lock tokens are passed
      *
      * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre\DAV\Locks\LockInfo)
+     * @param mixed $lastLock This variable will be populated with the last checked lock object (SabreForRainLoop\DAV\Locks\LockInfo)
      * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
      * @return bool
      */
@@ -614,7 +614,7 @@ class Plugin extends DAV\ServerPlugin {
     }
 
     /**
-     * Parses a webdav lock xml body, and returns a new Sabre\DAV\Locks\LockInfo object
+     * Parses a webdav lock xml body, and returns a new SabreForRainLoop\DAV\Locks\LockInfo object
      *
      * @param string $body
      * @return DAV\Locks\LockInfo
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
index 669acafc0..4959f012b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Mount/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Mount/Plugin.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Mount;
+namespace SabreForRainLoop\DAV\Mount;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This plugin provides support for RFC4709: Mounting WebDAV servers
@@ -18,7 +18,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to Server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Node.php
similarity index 87%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Node.php
index 53c4b831a..52e460e21 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Node.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Node class
@@ -29,7 +29,7 @@ abstract class Node implements INode {
     /**
      * Deletes the current node
      *
-     * @throws Sabre\DAV\Exception\Forbidden
+     * @throws SabreForRainLoop\DAV\Exception\Forbidden
      * @return void
      */
     public function delete() {
@@ -41,7 +41,7 @@ abstract class Node implements INode {
     /**
      * Renames the node
      *
-     * @throws Sabre\DAV\Exception\Forbidden
+     * @throws SabreForRainLoop\DAV\Exception\Forbidden
      * @param string $name The new name
      * @return void
      */
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ObjectTree.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ObjectTree.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/ObjectTree.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ObjectTree.php
index fda55e19a..87a424c3e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ObjectTree.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ObjectTree.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * ObjectTree class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/IFile.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/IFile.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/IFile.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/IFile.php
index 15598a010..a3eee51e2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/IFile.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/IFile.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\PartialUpdate;
+namespace SabreForRainLoop\DAV\PartialUpdate;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This interface provides a way to modify only part of a target resource
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/Plugin.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/Plugin.php
index cc06c8369..1a210307e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PartialUpdate/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PartialUpdate/Plugin.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\PartialUpdate;
+namespace SabreForRainLoop\DAV\PartialUpdate;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Partial update plugin (Patch method)
@@ -11,7 +11,7 @@ use Sabre\DAV;
  * It may bu used to update a file chunk, upload big a file into smaller
  * chunks or resume an upload.
  *
- * $patchPlugin = new \Sabre\DAV\PartialUpdate\Plugin();
+ * $patchPlugin = new \SabreForRainLoop\DAV\PartialUpdate\Plugin();
  * $server->addPlugin($patchPlugin);
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
@@ -23,7 +23,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to server
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
index 00f0df3fe..36d4ea694 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Abstract property class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/GetLastModified.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/GetLastModified.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/GetLastModified.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/GetLastModified.php
index 9240f55cc..f64d2cfd4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/GetLastModified.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/GetLastModified.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
-use Sabre\HTTP;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\HTTP;
 
 /**
  * This property represents the {DAV:}getlastmodified property.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Href.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Href.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Href.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Href.php
index ac198c723..71dcc244f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Href.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Href.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Href property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/HrefList.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/HrefList.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/HrefList.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/HrefList.php
index 3eab755ca..05ba266a2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/HrefList.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/HrefList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * HrefList property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/IHref.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/IHref.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/IHref.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/IHref.php
index a4ae09b3f..d2b4d4d2f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/IHref.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/IHref.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
 /**
  * IHref interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/LockDiscovery.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/LockDiscovery.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/LockDiscovery.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/LockDiscovery.php
index 3b36ca6a7..09a436386 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/LockDiscovery.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/LockDiscovery.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Represents {DAV:}lockdiscovery property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResourceType.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResourceType.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResourceType.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResourceType.php
index 9582d5598..7d12e3132 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResourceType.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResourceType.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This class represents the {DAV:}resourcetype property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Response.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Response.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Response.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Response.php
index 58e90d89d..151e795d5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/Response.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/Response.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Response property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResponseList.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResponseList.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResponseList.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResponseList.php
index b605a4e9a..62c4308f5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/ResponseList.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/ResponseList.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * ResponseList property
@@ -25,7 +25,7 @@ class ResponseList extends DAV\Property {
     private $responses;
 
     /**
-     * The only valid argument is a list of Sabre\DAV\Property\Response
+     * The only valid argument is a list of SabreForRainLoop\DAV\Property\Response
      * objects.
      *
      * @param array $responses;
@@ -34,7 +34,7 @@ class ResponseList extends DAV\Property {
 
         foreach($responses as $response) {
             if (!($response instanceof Response)) {
-                throw new \InvalidArgumentException('You must pass an array of Sabre\DAV\Property\Response objects');
+                throw new \InvalidArgumentException('You must pass an array of SabreForRainLoop\DAV\Property\Response objects');
             }
         }
         $this->responses = $responses;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
index e6f477c38..5ddde6478 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedLock.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedLock.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This class represents the {DAV:}supportedlock property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedReportSet.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedReportSet.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedReportSet.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedReportSet.php
index 993105b8a..d0273e46c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Property/SupportedReportSet.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Property/SupportedReportSet.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAV\Property;
+namespace SabreForRainLoop\DAV\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * supported-report-set property.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PropertyInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PropertyInterface.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/PropertyInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PropertyInterface.php
index 856e643f3..fe0c016ea 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/PropertyInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/PropertyInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * PropertyInterface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Server.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Server.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Server.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Server.php
index 11ac642d6..55b470dbd 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Server.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Server.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAV;
-use Sabre\HTTP;
+namespace SabreForRainLoop\DAV;
+use SabreForRainLoop\HTTP;
 
 /**
  * Main DAV server class
@@ -35,7 +35,7 @@ class Server {
     /**
      * The tree object
      *
-     * @var Sabre\DAV\Tree
+     * @var SabreForRainLoop\DAV\Tree
      */
     public $tree;
 
@@ -49,14 +49,14 @@ class Server {
     /**
      * httpResponse
      *
-     * @var Sabre\HTTP\Response
+     * @var SabreForRainLoop\HTTP\Response
      */
     public $httpResponse;
 
     /**
      * httpRequest
      *
-     * @var Sabre\HTTP\Request
+     * @var SabreForRainLoop\HTTP\Request
      */
     public $httpRequest;
 
@@ -94,7 +94,7 @@ class Server {
      * @var array
      */
     public $propertyMap = array(
-        '{DAV:}resourcetype' => 'Sabre\\DAV\\Property\\ResourceType',
+        '{DAV:}resourcetype' => 'SabreForRainLoop\\DAV\\Property\\ResourceType',
     );
 
     public $protectedProperties = array(
@@ -131,12 +131,12 @@ class Server {
      * based on a node's classname or interface.
      *
      * The preset ensures that {DAV:}collection is automaticlly added for nodes
-     * implementing Sabre\DAV\ICollection.
+     * implementing SabreForRainLoop\DAV\ICollection.
      *
      * @var array
      */
     public $resourceTypeMapping = array(
-        'Sabre\\DAV\\ICollection' => '{DAV:}collection',
+        'SabreForRainLoop\\DAV\\ICollection' => '{DAV:}collection',
     );
 
     /**
@@ -152,12 +152,12 @@ class Server {
     /**
      * Sets up the server
      *
-     * If a Sabre\DAV\Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre\DAV\INode is passed, it
-     * will create a Sabre\DAV\ObjectTree and use the node as the root.
+     * If a SabreForRainLoop\DAV\Tree object is passed as an argument, it will
+     * use it as the directory tree. If a SabreForRainLoop\DAV\INode is passed, it
+     * will create a SabreForRainLoop\DAV\ObjectTree and use the node as the root.
      *
-     * If nothing is passed, a Sabre\DAV\SimpleCollection is created in
-     * a Sabre\DAV\ObjectTree.
+     * If nothing is passed, a SabreForRainLoop\DAV\SimpleCollection is created in
+     * a SabreForRainLoop\DAV\ObjectTree.
      *
      * If an array is passed, we automatically create a root node, and use
      * the nodes in the array as top-level children.
@@ -176,7 +176,7 @@ class Server {
             // create the root node.
             foreach($treeOrNode as $node) {
                 if (!($node instanceof INode)) {
-                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre\\DAV\\INode');
+                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement SabreForRainLoop\\DAV\\INode');
                 }
             }
 
@@ -187,7 +187,7 @@ class Server {
             $root = new SimpleCollection('root');
             $this->tree = new ObjectTree($root);
         } else {
-            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
+            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of SabreForRainLoop\\DAV\\Tree, SabreForRainLoop\\DAV\\INode, an array or null');
         }
         $this->httpResponse = new HTTP\Response();
         $this->httpRequest = new HTTP\Request();
@@ -340,7 +340,7 @@ class Server {
     /**
      * Adds a plugin to the server
      *
-     * For more information, console the documentation of Sabre\DAV\ServerPlugin
+     * For more information, console the documentation of SabreForRainLoop\DAV\ServerPlugin
      *
      * @param ServerPlugin $plugin
      * @return void
@@ -1157,7 +1157,7 @@ class Server {
     /**
      * Returns the HTTP depth header
      *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre\DAV\Server::DEPTH_INFINITY object
+     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the SabreForRainLoop\DAV\Server::DEPTH_INFINITY object
      * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
      *
      * @param mixed $default
@@ -1820,7 +1820,7 @@ class Server {
             ));
         }
 
-        // If the node is not an instance of Sabre\DAV\IProperties, every
+        // If the node is not an instance of SabreForRainLoop\DAV\IProperties, every
         // property is 403 Forbidden
         if (!$hasError && count($remainingProperties) && !($node instanceof IProperties)) {
             $hasError = true;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
index b8396abaf..83cde5756 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/ServerPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/ServerPlugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * The baseclass for all server plugins.
@@ -16,7 +16,7 @@ abstract class ServerPlugin {
     /**
      * This initializes the plugin.
      *
-     * This function is called by Sabre\DAV\Server, after
+     * This function is called by SabreForRainLoop\DAV\Server, after
      * addPlugin is called.
      *
      * This method should set up the required event subscriptions.
@@ -60,7 +60,7 @@ abstract class ServerPlugin {
      * Returns a plugin name.
      *
      * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
+     * using \SabreForRainLoop\DAV\Server::getPlugin
      *
      * @return string
      */
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleCollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleCollection.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleCollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleCollection.php
index c38c39e72..504bb7ce8 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * SimpleCollection
@@ -42,7 +42,7 @@ class SimpleCollection extends Collection {
         $this->name = $name;
         foreach($children as $child) {
 
-            if (!($child instanceof INode)) throw new Exception('Only instances of Sabre\DAV\INode are allowed to be passed in the children argument');
+            if (!($child instanceof INode)) throw new Exception('Only instances of SabreForRainLoop\DAV\INode are allowed to be passed in the children argument');
             $this->addChild($child);
 
         }
@@ -78,7 +78,7 @@ class SimpleCollection extends Collection {
      * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
      * Generally its wise to override this, as this can usually be optimized
      *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+     * This method must throw SabreForRainLoop\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
index 694207eec..d1b2d7e3a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/SimpleFile.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/SimpleFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * SimpleFile
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/StringUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/StringUtil.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/StringUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/StringUtil.php
index 0f299bf11..4c9dcee5a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/StringUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/StringUtil.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * String utility
  *
  * This class is mainly used to implement the 'text-match' filter, used by both
  * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
- * Because they both need it, it was decided to put it in Sabre\DAV instead.
+ * Because they both need it, it was decided to put it in SabreForRainLoop\DAV instead.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/TemporaryFileFilterPlugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/TemporaryFileFilterPlugin.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/TemporaryFileFilterPlugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/TemporaryFileFilterPlugin.php
index d1ae18d5b..6aa6745f0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/TemporaryFileFilterPlugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Temporary File Filter Plugin
@@ -47,7 +47,7 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
     /**
      * A reference to the main Server class
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -80,7 +80,7 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
      * Initialize the plugin
      *
      * This is called automatically be the Server class after this plugin is
-     * added with Sabre\DAV\Server::addPlugin()
+     * added with SabreForRainLoop\DAV\Server::addPlugin()
      *
      * @param Server $server
      * @return void
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree.php
index af08c39f0..49fa99d6d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * Abstract tree object
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree/Filesystem.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree/Filesystem.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree/Filesystem.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree/Filesystem.php
index 9004f678a..7546c058c 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Tree/Filesystem.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Tree/Filesystem.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Sabre\DAV\Tree;
+namespace SabreForRainLoop\DAV\Tree;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * FileSystem Tree
  *
  * This class is an alternative to the standard ObjectTree. This tree can only
- * use Sabre\DAV\FS\Directory and File classes, but as a result it allows for a few
+ * use SabreForRainLoop\DAV\FS\Directory and File classes, but as a result it allows for a few
  * optimizations that otherwise wouldn't be possible.
  *
  * Specifically copying and moving are much, much faster.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/URLUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/URLUtil.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/URLUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/URLUtil.php
index b71ea003d..65f4d9ba9 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/URLUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/URLUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * URL utility class
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/UUIDUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/UUIDUtil.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/UUIDUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/UUIDUtil.php
index e6b78fac6..99cee04dc 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/UUIDUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/UUIDUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * UUID Utility
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Version.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Version.php
index c82bc17e3..9c3629f21 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * This class contains the SabreDAV version constants.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/XMLUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/XMLUtil.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAV/XMLUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/XMLUtil.php
index 298398da0..c3df4dd02 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/XMLUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAV/XMLUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAV;
+namespace SabreForRainLoop\DAV;
 
 /**
  * XML utilities for WebDAV
@@ -85,11 +85,11 @@ class XMLUtil {
     /**
      * This method provides a generic way to load a DOMDocument for WebDAV use.
      *
-     * This method throws a Sabre\DAV\Exception\BadRequest exception for any xml errors.
+     * This method throws a SabreForRainLoop\DAV\Exception\BadRequest exception for any xml errors.
      * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
      *
      * @param string $xml
-     * @throws Sabre\DAV\Exception\BadRequest
+     * @throws SabreForRainLoop\DAV\Exception\BadRequest
      * @return DOMDocument
      */
     static function loadDOMDocument($xml) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/AbstractPrincipalCollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/AbstractPrincipalCollection.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/AbstractPrincipalCollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/AbstractPrincipalCollection.php
index 3f9a080d4..342796fb4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/AbstractPrincipalCollection.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAVACL;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 /**
  * Principals Collection
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/AceConflict.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/AceConflict.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/AceConflict.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/AceConflict.php
index 25c8b7f4c..cc91a95d0 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/AceConflict.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/AceConflict.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Exception;
+namespace SabreForRainLoop\DAVACL\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This exception is thrown when a client attempts to set conflicting
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NeedPrivileges.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NeedPrivileges.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NeedPrivileges.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NeedPrivileges.php
index 5ec4a8e88..9b4db9b52 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NeedPrivileges.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Exception;
+namespace SabreForRainLoop\DAVACL\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * NeedPrivileges
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NoAbstract.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NoAbstract.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NoAbstract.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NoAbstract.php
index 836153ef1..0f821062d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NoAbstract.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NoAbstract.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Exception;
+namespace SabreForRainLoop\DAVACL\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This exception is thrown when a user tries to set a privilege that's marked
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotRecognizedPrincipal.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotRecognizedPrincipal.php
index 753945b3d..9e95cc514 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Exception;
+namespace SabreForRainLoop\DAVACL\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * If a client tried to set a privilege assigned to a non-existant principal,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotSupportedPrivilege.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotSupportedPrivilege.php
index aa976334f..461ebe3f8 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Exception/NotSupportedPrivilege.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Exception;
+namespace SabreForRainLoop\DAVACL\Exception;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * If a client tried to set a privilege that doesn't exist, this exception will
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IACL.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IACL.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IACL.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IACL.php
index 2fbfb5463..31971d544 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IACL.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IACL.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAVACL;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 /**
  * ACL-enabled node
@@ -60,7 +60,7 @@ interface IACL extends DAV\INode {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipal.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipal.php
index 87e3f4ec5..999b64417 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL;
+namespace SabreForRainLoop\DAVACL;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * IPrincipal interface
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipalCollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipalCollection.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipalCollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipalCollection.php
index 33ffd3317..8b7cf77c2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/IPrincipalCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/IPrincipalCollection.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL;
+namespace SabreForRainLoop\DAVACL;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Principal Collection interface.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Plugin.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Plugin.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Plugin.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Plugin.php
index 1609d942f..89269b43b 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Plugin.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Plugin.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAVACL;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAVACL;
+use SabreForRainLoop\DAV;
 
 /**
  * SabreDAV ACL Plugin
@@ -43,7 +43,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to server object.
      *
-     * @var Sabre\DAV\Server
+     * @var SabreForRainLoop\DAV\Server
      */
     protected $server;
 
@@ -140,7 +140,7 @@ class Plugin extends DAV\ServerPlugin {
      * Returns a plugin name.
      *
      * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
+     * using SabreForRainLoop\DAV\Server::getPlugin
      *
      * @return string
      */
@@ -182,7 +182,7 @@ class Plugin extends DAV\ServerPlugin {
      * @param array|string $privileges
      * @param int $recursion
      * @param bool $throwExceptions if set to false, this method won't throw exceptions.
-     * @throws Sabre\DAVACL\Exception\NeedPrivileges
+     * @throws SabreForRainLoop\DAVACL\Exception\NeedPrivileges
      * @return bool
      */
     public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
@@ -234,7 +234,7 @@ class Plugin extends DAV\ServerPlugin {
 
         $authPlugin = $this->server->getPlugin('auth');
         if (is_null($authPlugin)) return null;
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
+        /** @var $authPlugin SabreForRainLoop\DAV\Auth\Plugin */
 
         $userName = $authPlugin->getCurrentUser();
         if (!$userName) return null;
@@ -599,7 +599,7 @@ class Plugin extends DAV\ServerPlugin {
      *                                   If this is ommitted, the standard
      *                                   principal collection-set will be used.
      * @return array     This method returns an array structure similar to
-     *                  Sabre\DAV\Server::getPropertiesForPath. Returned
+     *                  SabreForRainLoop\DAV\Server::getPropertiesForPath. Returned
      *                  properties are index by a HTTP status code.
      *
      */
@@ -678,11 +678,11 @@ class Plugin extends DAV\ServerPlugin {
 
         // Automatically mapping nodes implementing IPrincipal to the
         // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
+        $server->resourceTypeMapping['SabreForRainLoop\\DAVACL\\IPrincipal'] = '{DAV:}principal';
 
         // Mapping the group-member-set property to the HrefList property
         // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Property\\HrefList';
+        $server->propertyMap['{DAV:}group-member-set'] = 'SabreForRainLoop\\DAV\\Property\\HrefList';
 
     }
 
@@ -965,7 +965,7 @@ class Plugin extends DAV\ServerPlugin {
                 $propertyDelta['{DAV:}group-member-set']->getHrefs()
             );
         } else {
-            throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
+            throw new DAV\Exception('The group-member-set property MUST be an instance of SabreForRainLoop\DAV\Property\HrefList or null');
         }
 
         if (!($node instanceof IPrincipal)) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
index 267100212..b2d9e9da5 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Principal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Principal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL;
+namespace SabreForRainLoop\DAVACL;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * Principal class
@@ -186,7 +186,7 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
      * Updates this principals properties.
      * 
      * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
+     * @see SabreForRainLoop\DAV\IProperties::updateProperties
      * @return bool|array
      */
     public function updateProperties($mutations) {
@@ -264,7 +264,7 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
      * Returns the list of supported privileges for this node.
      *
      * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * See SabreForRainLoop\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
      * standard structure.
      *
      * If null is returned from this method, the default privilege set is used,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/AbstractBackend.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/AbstractBackend.php
index 234d334e8..3f500e300 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/AbstractBackend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAVACL\PrincipalBackend;
+namespace SabreForRainLoop\DAVACL\PrincipalBackend;
 
 /**
  * Abstract Principal Backend
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/BackendInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/BackendInterface.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/BackendInterface.php
index 6bb21e566..4c96c9411 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/BackendInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Sabre\DAVACL\PrincipalBackend;
+namespace SabreForRainLoop\DAVACL\PrincipalBackend;
 
 /**
  * Implement this interface to create your own principal backends.
  *
  * Creating backends for principals is entirely optional. You can also
- * implement Sabre\DAVACL\IPrincipal directly. This interface is used solely by
- * Sabre\DAVACL\AbstractPrincipalCollection.
+ * implement SabreForRainLoop\DAVACL\IPrincipal directly. This interface is used solely by
+ * SabreForRainLoop\DAVACL\AbstractPrincipalCollection.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/PDO.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/PDO.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/PDO.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/PDO.php
index 17c271150..4717c495a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalBackend/PDO.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\DAVACL\PrincipalBackend;
+namespace SabreForRainLoop\DAVACL\PrincipalBackend;
 
-use Sabre\DAV;
-use Sabre\DAVACL;
+use SabreForRainLoop\DAV;
+use SabreForRainLoop\DAVACL;
 
 /**
  * PDO principal backend
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalCollection.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalCollection.php
similarity index 84%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalCollection.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalCollection.php
index 32216311b..aa8cdd894 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/PrincipalCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/PrincipalCollection.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\DAVACL;
+namespace SabreForRainLoop\DAVACL;
 
 /**
  * Principals Collection
  *
  * This collection represents a list of users.
- * The users are instances of Sabre\DAVACL\Principal
+ * The users are instances of SabreForRainLoop\DAVACL\Principal
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
@@ -22,7 +22,7 @@ class PrincipalCollection extends AbstractPrincipalCollection {
      * supplied by the authentication backend.
      *
      * @param array $principal
-     * @return \Sabre\DAV\INode
+     * @return \SabreForRainLoop\DAV\INode
      */
     public function getChildForPrincipal(array $principal) {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Acl.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Acl.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Acl.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Acl.php
index 158628c30..8284fd379 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Acl.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Acl.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Property;
+namespace SabreForRainLoop\DAVACL\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * This class represents the {DAV:}acl property
@@ -32,7 +32,7 @@ class Acl extends DAV\Property {
      * Constructor
      *
      * This object requires a structure similar to the return value from
-     * Sabre\DAVACL\Plugin::getACL().
+     * SabreForRainLoop\DAVACL\Plugin::getACL().
      *
      * Each privilege is a an array with at least a 'privilege' property, and a
      * 'principal' property. A privilege may have a 'protected' property as
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/AclRestrictions.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/AclRestrictions.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/AclRestrictions.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/AclRestrictions.php
index fa79b4af0..f512424b3 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/AclRestrictions.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/AclRestrictions.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Property;
+namespace SabreForRainLoop\DAVACL\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * AclRestrictions property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/CurrentUserPrivilegeSet.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/CurrentUserPrivilegeSet.php
index 5b7a81ccb..42307930a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/CurrentUserPrivilegeSet.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Property;
+namespace SabreForRainLoop\DAVACL\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * CurrentUserPrivilegeSet
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Principal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Principal.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Principal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Principal.php
index 951ef7f8e..c6f813f1f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/Principal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/Principal.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\DAVACL\Property;
-use Sabre\DAV;
+namespace SabreForRainLoop\DAVACL\Property;
+use SabreForRainLoop\DAV;
 
 /**
  * Principal property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/SupportedPrivilegeSet.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/SupportedPrivilegeSet.php
index ee074fff5..2f3e507fe 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Property/SupportedPrivilegeSet.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\DAVACL\Property;
+namespace SabreForRainLoop\DAVACL\Property;
 
-use Sabre\DAV;
+use SabreForRainLoop\DAV;
 
 /**
  * SupportedPrivilegeSet property
@@ -11,7 +11,7 @@ use Sabre\DAV;
  * in rfc3744. Please consult the rfc for details about it's structure.
  *
  * This class expects a structure like the one given from
- * Sabre\DAVACL\Plugin::getSupportedPrivilegeSet as the argument in its
+ * SabreForRainLoop\DAVACL\Plugin::getSupportedPrivilegeSet as the argument in its
  * constructor.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Version.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Version.php
index b01e2e65b..722ab4901 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAVACL/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/DAVACL/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\DAVACL;
+namespace SabreForRainLoop\DAVACL;
 
 /**
  * This class contains the SabreDAV version constants.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AWSAuth.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AWSAuth.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AWSAuth.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AWSAuth.php
index f697f23f1..a77740d49 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AWSAuth.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AWSAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP AWS Authentication handler
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AbstractAuth.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AbstractAuth.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AbstractAuth.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AbstractAuth.php
index 886e34737..0db298306 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/AbstractAuth.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/AbstractAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP Authentication baseclass
@@ -25,7 +25,7 @@ abstract class AbstractAuth {
     /**
      * HTTP response helper
      *
-     * @var Sabre\HTTP\Response
+     * @var SabreForRainLoop\HTTP\Response
      */
     protected $httpResponse;
 
@@ -33,7 +33,7 @@ abstract class AbstractAuth {
     /**
      * HTTP request helper
      *
-     * @var Sabre\HTTP\Request
+     * @var SabreForRainLoop\HTTP\Request
      */
     protected $httpRequest;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/BasicAuth.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/BasicAuth.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/BasicAuth.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/BasicAuth.php
index 36aa31cbc..bcb087ed2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/BasicAuth.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/BasicAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP Basic Authentication handler
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/DigestAuth.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/DigestAuth.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/DigestAuth.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/DigestAuth.php
index 19b58eba3..62310f7ce 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/DigestAuth.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/DigestAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP Digest Authentication handler
@@ -68,8 +68,8 @@ class DigestAuth extends AbstractAuth {
      * Sets the quality of protection value.
      *
      * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
+     *   SabreForRainLoop\HTTP\DigestAuth::QOP_AUTH
+     *   SabreForRainLoop\HTTP\DigestAuth::QOP_AUTHINT
      *
      * Multiple values can be specified using logical OR.
      *
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Request.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Request.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Request.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Request.php
index b0f1e62bf..3942af8c4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Request.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP Request information
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Response.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Response.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Response.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Response.php
index fd7c0bc38..cb4b9dabd 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Response.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * This class represents a HTTP response.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Util.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Util.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Util.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Util.php
index 42fd0a003..e308618a1 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Util.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Util.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
  * HTTP utility methods
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Version.php
similarity index 79%
rename from rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Version.php
index f4b70437f..c14bd03f7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/HTTP/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/HTTP/Version.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\HTTP;
+namespace SabreForRainLoop\HTTP;
 
 /**
- * This class contains the Sabre\HTTP version constants.
+ * This class contains the SabreForRainLoop\HTTP version constants.
  *
  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Cli.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Cli.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Cli.php
index eacc98f7d..5bfc1851f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Cli.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 use
     InvalidArgumentException;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component.php
index 72428cbfc..70cf550d4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Component
@@ -104,7 +104,7 @@ class Component extends Node {
 
         } else {
 
-            throw new \InvalidArgumentException('The first argument must either be a \\Sabre\\VObject\\Node or a string');
+            throw new \InvalidArgumentException('The first argument must either be a \\SabreForRainLoop\\VObject\\Node or a string');
 
         }
 
@@ -402,7 +402,7 @@ class Component extends Node {
                 $this->children[] = $property;
             }
         } else {
-            throw new \InvalidArgumentException('You must pass a \\Sabre\\VObject\\Component, \\Sabre\\VObject\\Property or scalar type');
+            throw new \InvalidArgumentException('You must pass a \\SabreForRainLoop\\VObject\\Component, \\SabreForRainLoop\\VObject\\Property or scalar type');
         }
 
     }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
index 2f86c44fd..6951c1996 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VAlarm.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\VObject\Component;
-use Sabre\VObject;
+namespace SabreForRainLoop\VObject\Component;
+use SabreForRainLoop\VObject;
 
 /**
  * VAlarm component
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCalendar.php
similarity index 57%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCalendar.php
index 6ae2068e0..ecc6784d4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCalendar.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Component;
+namespace SabreForRainLoop\VObject\Component;
 
 use
-    Sabre\VObject,
-    Sabre\VObject\Component;
+    SabreForRainLoop\VObject,
+    SabreForRainLoop\VObject\Component;
 
 /**
  * The VCalendar component
@@ -32,11 +32,11 @@ class VCalendar extends VObject\Document {
      * @var array
      */
     static public $componentMap = array(
-        'VEVENT'    => 'Sabre\\VObject\\Component\\VEvent',
-        'VFREEBUSY' => 'Sabre\\VObject\\Component\\VFreeBusy',
-        'VJOURNAL'  => 'Sabre\\VObject\\Component\\VJournal',
-        'VTODO'     => 'Sabre\\VObject\\Component\\VTodo',
-        'VALARM'    => 'Sabre\\VObject\\Component\\VAlarm',
+        'VEVENT'    => 'SabreForRainLoop\\VObject\\Component\\VEvent',
+        'VFREEBUSY' => 'SabreForRainLoop\\VObject\\Component\\VFreeBusy',
+        'VJOURNAL'  => 'SabreForRainLoop\\VObject\\Component\\VJournal',
+        'VTODO'     => 'SabreForRainLoop\\VObject\\Component\\VTodo',
+        'VALARM'    => 'SabreForRainLoop\\VObject\\Component\\VAlarm',
     );
 
     /**
@@ -45,21 +45,21 @@ class VCalendar extends VObject\Document {
      * @var array
      */
     static public $valueMap = array(
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CAL-ADDRESS'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
-        'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+        'BINARY'           => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'BOOLEAN'          => 'SabreForRainLoop\\VObject\\Property\\Boolean',
+        'CAL-ADDRESS'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'DATE'             => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Date',
+        'DATE-TIME'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
+        'FLOAT'            => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'INTEGER'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'PERIOD'           => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Period',
+        'RECUR'            => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur',
+        'TEXT'             => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'TIME'             => 'SabreForRainLoop\\VObject\\Property\\Time',
+        'UNKNOWN'          => 'SabreForRainLoop\\VObject\\Property\\Unknown', // jCard / jCal-only.
+        'URI'              => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UTC-OFFSET'       => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
     );
 
     /**
@@ -69,75 +69,75 @@ class VCalendar extends VObject\Document {
      */
     static public $propertyMap = array(
         // Calendar properties
-        'CALSCALE'      => 'Sabre\\VObject\\Property\\FlatText',
-        'METHOD'        => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'        => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION'       => 'Sabre\\VObject\\Property\\FlatText',
+        'CALSCALE'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'METHOD'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PRODID'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'VERSION'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Component properties
-        'ATTACH'            => 'Sabre\\VObject\\Property\\Binary',
-        'CATEGORIES'        => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
-        'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
-        'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\Float',
-        'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\Integer',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\Integer',
-        'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
-        'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
-        'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
+        'ATTACH'            => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'CATEGORIES'        => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'CLASS'             => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'COMMENT'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'DESCRIPTION'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'GEO'               => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'LOCATION'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PERCENT-COMPLETE'  => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'PRIORITY'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'RESOURCES'         => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'STATUS'            => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'SUMMARY'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Date and Time Component Properties
-        'COMPLETED'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTEND'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DUE'           => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTART'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'      => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FREEBUSY'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'TRANSP'        => 'Sabre\\VObject\\Property\\FlatText',
+        'COMPLETED'     => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTEND'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DUE'           => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTSTART'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
+        'FREEBUSY'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Period',
+        'TRANSP'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Time Zone Component Properties
-        'TZID'          => 'Sabre\\VObject\\Property\\FlatText',
-        'TZNAME'        => 'Sabre\\VObject\\Property\\FlatText',
-        'TZOFFSETFROM'  => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZOFFSETTO'    => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZURL'         => 'Sabre\\VObject\\Property\\Uri',
+        'TZID'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZNAME'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZOFFSETFROM'  => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
+        'TZOFFSETTO'    => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
+        'TZURL'         => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // Relationship Component Properties
-        'ATTENDEE'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'CONTACT'       => 'Sabre\\VObject\\Property\\FlatText',
-        'ORGANIZER'     => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'RECURRENCE-ID' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RELATED-TO'    => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'           => 'Sabre\\VObject\\Property\\Uri',
-        'UID'           => 'Sabre\\VObject\\Property\\FlatText',
+        'ATTENDEE'      => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'CONTACT'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ORGANIZER'     => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\CalAddress',
+        'RECURRENCE-ID' => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RELATED-TO'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'URL'           => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UID'           => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
         // Recurrence Component Properties
-        'EXDATE'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RDATE'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RRULE'         => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'EXRULE'        => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
+        'EXDATE'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RDATE'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'RRULE'         => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur',
+        'EXRULE'        => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
 
         // Alarm Component Properties
-        'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\Integer',
-        'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+        'ACTION'        => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'REPEAT'        => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'TRIGGER'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\Duration',
 
         // Change Management Component Properties
-        'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'SEQUENCE'      => 'Sabre\\VObject\\Property\\Integer',
+        'CREATED'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'DTSTAMP'       => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'LAST-MODIFIED' => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'SEQUENCE'      => 'SabreForRainLoop\\VObject\\Property\\Integer',
 
         // Request Status
-        'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
+        'REQUEST-STATUS' => 'SabreForRainLoop\\VObject\\Property\\Text',
 
         // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT'    => 'Sabre\\VObject\\Property\\Text',
-        'ACKNOWLEDGED'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'PROXIMITY'      => 'Sabre\\VObject\\Property\\Text',
-        'DEFAULT-ALARM'  => 'Sabre\\VObject\\Property\\Boolean',
+        'ALARM-AGENT'    => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'ACKNOWLEDGED'   => 'SabreForRainLoop\\VObject\\Property\\ICalendar\\DateTime',
+        'PROXIMITY'      => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'DEFAULT-ALARM'  => 'SabreForRainLoop\\VObject\\Property\\Boolean',
 
     );
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
similarity index 63%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
index 69eb8d4c1..e44ac3f1f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VCard.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Component;
+namespace SabreForRainLoop\VObject\Component;
 
 use
-    Sabre\VObject;
+    SabreForRainLoop\VObject;
 
 /**
  * The VCard component
@@ -39,22 +39,22 @@ class VCard extends VObject\Document {
      * @var array
      */
     static public $valueMap = array(
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
-        'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
-        'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
-        'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'URL'              => 'Sabre\\VObject\\Property\\Uri', // vCard 2.1 only
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+        'BINARY'           => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        'BOOLEAN'          => 'SabreForRainLoop\\VObject\\Property\\Boolean',
+        'CONTENT-ID'       => 'SabreForRainLoop\\VObject\\Property\\FlatText',   // vCard 2.1 only
+        'DATE'             => 'SabreForRainLoop\\VObject\\Property\\VCard\\Date',
+        'DATE-TIME'        => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateTime',
+        'DATE-AND-OR-TIME' => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
+        'FLOAT'            => 'SabreForRainLoop\\VObject\\Property\\Float',
+        'INTEGER'          => 'SabreForRainLoop\\VObject\\Property\\Integer',
+        'LANGUAGE-TAG'     => 'SabreForRainLoop\\VObject\\Property\\VCard\\LanguageTag',
+        'TIMESTAMP'        => 'SabreForRainLoop\\VObject\\Property\\VCard\\TimeStamp',
+        'TEXT'             => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'TIME'             => 'SabreForRainLoop\\VObject\\Property\\Time',
+        'UNKNOWN'          => 'SabreForRainLoop\\VObject\\Property\\Unknown', // jCard / jCal-only.
+        'URI'              => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'URL'              => 'SabreForRainLoop\\VObject\\Property\\Uri', // vCard 2.1 only
+        'UTC-OFFSET'       => 'SabreForRainLoop\\VObject\\Property\\UtcOffset',
     );
 
     /**
@@ -65,53 +65,53 @@ class VCard extends VObject\Document {
     static public $propertyMap = array(
 
         // vCard 2.1 properties and up
-        'N'       => 'Sabre\\VObject\\Property\\Text',
-        'FN'      => 'Sabre\\VObject\\Property\\FlatText',
-        'PHOTO'   => 'Sabre\\VObject\\Property\\Binary', // Todo: we should add a class for Binary values.
-        'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'ADR'     => 'Sabre\\VObject\\Property\\Text',
-        'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
-        'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
-        'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
-        'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
-        // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
+        'N'       => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'FN'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PHOTO'   => 'SabreForRainLoop\\VObject\\Property\\Binary', // Todo: we should add a class for Binary values.
+        'BDAY'    => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime',
+        'ADR'     => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'LABEL'   => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'TEL'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'EMAIL'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'MAILER'  => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'GEO'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TITLE'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ROLE'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'LOGO'    => 'SabreForRainLoop\\VObject\\Property\\Binary',
+        // 'AGENT'   => 'SabreForRainLoop\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
                                  // not supported at the moment
-        'ORG'     => 'Sabre\\VObject\\Property\\Text',
-        'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
-        'URL'     => 'Sabre\\VObject\\Property\\Uri',
-        'UID'     => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
-        'KEY'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TZ'      => 'Sabre\\VObject\\Property\\Text',
+        'ORG'     => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'NOTE'    => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'REV'     => 'SabreForRainLoop\\VObject\\Property\\VCard\\TimeStamp',
+        'SOUND'   => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'URL'     => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'UID'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'VERSION' => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'KEY'     => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'TZ'      => 'SabreForRainLoop\\VObject\\Property\\Text',
 
         // vCard 3.0 properties
-        'CATEGORIES'  => 'Sabre\\VObject\\Property\\Text',
-        'SORT-STRING' => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'      => 'Sabre\\VObject\\Property\\FlatText',
-        'NICKNAME'    => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'CATEGORIES'  => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'SORT-STRING' => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'PRODID'      => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'NICKNAME'    => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'CLASS'       => 'SabreForRainLoop\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 
         // rfc2739 properties
-        'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
-        'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
+        'FBURL'        => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'CAPURI'       => 'SabreForRainLoop\\VObject\\Property\\Uri',
+        'CALURI'       => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // rfc4770 properties
-        'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
+        'IMPP'         => 'SabreForRainLoop\\VObject\\Property\\Uri',
 
         // vCard 4.0 properties
-        'XML'          => 'Sabre\\VObject\\Property\\FlatText',
-        'ANNIVERSARY'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'CLIENTPIDMAP' => 'Sabre\\VObject\\Property\\Text',
-        'LANG'         => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
-        'GENDER'       => 'Sabre\\VObject\\Property\\Text',
-        'KIND'         => 'Sabre\\VObject\\Property\\FlatText',
+        'XML'          => 'SabreForRainLoop\\VObject\\Property\\FlatText',
+        'ANNIVERSARY'  => 'SabreForRainLoop\\VObject\\Property\\VCard\\DateAndOrTime',
+        'CLIENTPIDMAP' => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'LANG'         => 'SabreForRainLoop\\VObject\\Property\\VCard\\LanguageTag',
+        'GENDER'       => 'SabreForRainLoop\\VObject\\Property\\Text',
+        'KIND'         => 'SabreForRainLoop\\VObject\\Property\\FlatText',
 
     );
 
@@ -342,8 +342,8 @@ class VCard extends VObject\Document {
         $className = parent::getClassNameForPropertyName($propertyName);
         // In vCard 4, BINARY no longer exists, and we need URI instead.
 
-        if ($className == 'Sabre\\VObject\\Property\\Binary' && $this->getDocumentType()===self::VCARD40) {
-            return 'Sabre\\VObject\\Property\\Uri';
+        if ($className == 'SabreForRainLoop\\VObject\\Property\\Binary' && $this->getDocumentType()===self::VCARD40) {
+            return 'SabreForRainLoop\\VObject\\Property\\Uri';
         }
         return $className;
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
index 0ce204566..b1dc19331 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VEvent.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace Sabre\VObject\Component;
-use Sabre\VObject;
+namespace SabreForRainLoop\VObject\Component;
+use SabreForRainLoop\VObject;
 
 /**
  * VEvent component
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VFreeBusy.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VFreeBusy.php
index 7afe9fdb3..1787c6bb9 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VFreeBusy.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\VObject\Component;
+namespace SabreForRainLoop\VObject\Component;
 
-use Sabre\VObject;
+use SabreForRainLoop\VObject;
 
 /**
  * The VFreeBusy component
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VJournal.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VJournal.php
index 0e561a1b3..8a54a2b0d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VJournal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\VObject\Component;
+namespace SabreForRainLoop\VObject\Component;
 
-use Sabre\VObject;
+use SabreForRainLoop\VObject;
 
 /**
  * VJournal component
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VTodo.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VTodo.php
index b1579cf74..27bd2e30d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Component/VTodo.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\VObject\Component;
+namespace SabreForRainLoop\VObject\Component;
 
-use Sabre\VObject;
+use SabreForRainLoop\VObject;
 
 /**
  * VTodo component
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/DateTimeParser.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/DateTimeParser.php
index 3fc4947ce..687a91761 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/DateTimeParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * DateTimeParser
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Document.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Document.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Document.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Document.php
index eaea26cb3..fd17b162d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Document.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Document.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Document
@@ -164,7 +164,7 @@ abstract class Document extends Component {
     public function createComponent($name, array $children = null, $defaults = true) {
 
         $name = strtoupper($name);
-        $class = 'Sabre\\VObject\\Component';
+        $class = 'SabreForRainLoop\\VObject\\Component';
 
         if (isset(static::$componentMap[$name])) {
             $class=static::$componentMap[$name];
@@ -253,7 +253,7 @@ abstract class Document extends Component {
         if (isset(static::$propertyMap[$propertyName])) {
             return static::$propertyMap[$propertyName];
         } else {
-            return 'Sabre\\VObject\\Property\\Unknown';
+            return 'SabreForRainLoop\\VObject\\Property\\Unknown';
         }
 
     }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ElementList.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ElementList.php
index 1c203708e..807a085c6 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ElementList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * VObject ElementList
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/EofException.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/EofException.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/EofException.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/EofException.php
index e1f2284c5..fc9350988 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/EofException.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/EofException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Exception thrown by parser when the end of the stream has been reached,
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/FreeBusyGenerator.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/FreeBusyGenerator.php
index a13497a6f..64879b902 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/FreeBusyGenerator.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 use
-    Sabre\VObject\Component\VCalendar;
+    SabreForRainLoop\VObject\Component\VCalendar;
 
 /**
  * This class helps with generating FREEBUSY reports based on existing sets of
@@ -113,7 +113,7 @@ class FreeBusyGenerator {
             } elseif ($object instanceof Component) {
                 $this->objects[] = $object;
             } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
+                throw new \InvalidArgumentException('You can only pass strings or \\SabreForRainLoop\\VObject\\Component arguments to setObjects');
             }
 
         }
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
index 3260a8c02..3330fceff 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Node.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Node.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * A node is the root class for every element in an iCalendar of vCard object.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parameter.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parameter.php
index adf5b6907..6e1531757 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parameter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 use
     ArrayObject;
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/ParseException.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ParseException.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/ParseException.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ParseException.php
index 66b49c606..5e3658c5f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/ParseException.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/ParseException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Exception thrown by Reader if an invalid object was attempted to be parsed.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Json.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Json.php
index b126cb616..d6637013d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Json.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\VObject\Parser;
+namespace SabreForRainLoop\VObject\Parser;
 
 use
-    Sabre\VObject\Component\VCalendar,
-    Sabre\VObject\Component\VCard,
-    Sabre\VObject\ParseException,
-    Sabre\VObject\EofException;
+    SabreForRainLoop\VObject\Component\VCalendar,
+    SabreForRainLoop\VObject\Component\VCard,
+    SabreForRainLoop\VObject\ParseException,
+    SabreForRainLoop\VObject\EofException;
 
 /**
  * Json Parser.
@@ -87,7 +87,7 @@ class Json extends Parser {
      * Parses a component
      *
      * @param array $jComp
-     * @return \Sabre\VObject\Component
+     * @return \SabreForRainLoop\VObject\Component
      */
     public function parseComponent(array $jComp) {
 
@@ -118,7 +118,7 @@ class Json extends Parser {
      * Parses properties.
      *
      * @param array $jProp
-     * @return \Sabre\VObject\Property
+     * @return \SabreForRainLoop\VObject\Property
      */
     public function parseProperty(array $jProp) {
 
@@ -152,8 +152,8 @@ class Json extends Parser {
         // represents TEXT values. We have to normalize these here. In the
         // future we can get rid of FlatText once we're allowed to break BC
         // again.
-        if ($defaultPropertyClass === 'Sabre\VObject\Property\FlatText') {
-            $defaultPropertyClass = 'Sabre\VObject\Property\Text';
+        if ($defaultPropertyClass === 'SabreForRainLoop\VObject\Property\FlatText') {
+            $defaultPropertyClass = 'SabreForRainLoop\VObject\Property\Text';
         }
 
         // If the value type we received (e.g.: TEXT) was not the default value
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/MimeDir.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/MimeDir.php
index dba9fed91..e95741fd1 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/MimeDir.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Sabre\VObject\Parser;
+namespace SabreForRainLoop\VObject\Parser;
 
 use
-    Sabre\VObject\ParseException,
-    Sabre\VObject\EofException,
-    Sabre\VObject\Component,
-    Sabre\VObject\Property,
-    Sabre\VObject\Component\VCalendar,
-    Sabre\VObject\Component\VCard;
+    SabreForRainLoop\VObject\ParseException,
+    SabreForRainLoop\VObject\EofException,
+    SabreForRainLoop\VObject\Component,
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Component\VCalendar,
+    SabreForRainLoop\VObject\Component\VCard;
 
 /**
  * MimeDir parser.
@@ -100,12 +100,12 @@ class MimeDir extends Parser {
             case 'BEGIN:VCALENDAR' :
                 $class = isset(VCalendar::$componentMap['VCALENDAR'])
                     ? VCalendar::$componentMap[$name]
-                    : 'Sabre\\VObject\\Component\\VCalendar';
+                    : 'SabreForRainLoop\\VObject\\Component\\VCalendar';
                 break;
             case 'BEGIN:VCARD' :
                 $class = isset(VCard::$componentMap['VCARD'])
                     ? VCard::$componentMap['VCARD']
-                    : 'Sabre\\VObject\\Component\\VCard';
+                    : 'SabreForRainLoop\\VObject\\Component\\VCard';
                 break;
             default :
                 throw new ParseException('This parser only supports VCARD and VCALENDAR files');
@@ -218,7 +218,7 @@ class MimeDir extends Parser {
      *
      * This method strips any newlines and also takes care of unfolding.
      *
-     * @throws \Sabre\VObject\EofException
+     * @throws \SabreForRainLoop\VObject\EofException
      * @return string
      */
     protected function readLine() {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Parser.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Parser.php
index c859e5a2b..22c90a1fe 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Parser/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject\Parser;
+namespace SabreForRainLoop\VObject\Parser;
 
 /**
  * Abstract parser.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property.php
index d04a05c2b..0dde8d0d3 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Binary.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Binary.php
index 8c8770d84..2e857c3df 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Binary.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
     LogicException,
-    Sabre\VObject\Property;
+    SabreForRainLoop\VObject\Property;
 
 /**
  * BINARY property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Boolean.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Boolean.php
index 840519f1f..75ea0d691 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Boolean.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
-    Sabre\VObject\Property;
+    SabreForRainLoop\VObject\Property;
 
 /**
  * Boolean property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/FlatText.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/FlatText.php
index 20c6f1ca3..57f30cda6 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/FlatText.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 /**
  * FlatText property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Float.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Float.php
similarity index 96%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Float.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Float.php
index bdfc1fa8e..02476f8dd 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Float.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Float.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
-    Sabre\VObject\Property;
+    SabreForRainLoop\VObject\Property;
 
 /**
  * Float property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/CalAddress.php
similarity index 88%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/CalAddress.php
index f1c1af034..e76a302ad 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/CalAddress.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property\Text;
+    SabreForRainLoop\VObject\Property\Text;
 
 /**
  * CalAddress property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Date.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Date.php
similarity index 63%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Date.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Date.php
index 095923cfe..e24840247 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Date.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Date.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\DateTimeParser,
-    Sabre\VObject\TimeZoneUtil;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\DateTimeParser,
+    SabreForRainLoop\VObject\TimeZoneUtil;
 
 /**
  * DateTime property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/DateTime.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/DateTime.php
index f088f53e4..5bea1c264 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/DateTime.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\DateTimeParser,
-    Sabre\VObject\TimeZoneUtil;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\DateTimeParser,
+    SabreForRainLoop\VObject\TimeZoneUtil;
 
 /**
  * DateTime property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Duration.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Duration.php
index 951340521..0f251102d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Duration.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\DateTimeParser;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\DateTimeParser;
 
 /**
  * Duration property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Period.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Period.php
index eb4dd1877..67c818c7a 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Period.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\DateTimeParser;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\DateTimeParser;
 
 /**
  * Period property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Recur.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Recur.php
index 25446415f..98e3f19d1 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/ICalendar/Recur.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Property\ICalendar;
+namespace SabreForRainLoop\VObject\Property\ICalendar;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Parser\MimeDir;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Parser\MimeDir;
 
 /**
  * Recur property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Integer.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Integer.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Integer.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Integer.php
index 9b6ab640a..a48c87402 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Integer.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Integer.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
-    Sabre\VObject\Property;
+    SabreForRainLoop\VObject\Property;
 
 /**
  * Integer property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Text.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Text.php
index dc1ee5726..b1651e3ae 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Text.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Component,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\Document;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Component,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\Document;
 
 /**
  * Text property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Time.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Time.php
index 35fc01d4b..394e37f6e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Time.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
-use Sabre\VObject\DateTimeParser;
+use SabreForRainLoop\VObject\DateTimeParser;
 
 /**
  * Time property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Unknown.php
similarity index 81%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Unknown.php
index 395c75045..c2a495153 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Unknown.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 use
-    Sabre\VObject\Property,
-    Sabre\VObject\Component,
-    Sabre\VObject\Parser\MimeDir,
-    Sabre\VObject\Document;
+    SabreForRainLoop\VObject\Property,
+    SabreForRainLoop\VObject\Component,
+    SabreForRainLoop\VObject\Parser\MimeDir,
+    SabreForRainLoop\VObject\Document;
 
 /**
  * Unknown property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Uri.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Uri.php
index 5c1471742..b61078086 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/Uri.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
-use Sabre\VObject\Property;
+use SabreForRainLoop\VObject\Property;
 
 /**
  * URI property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/UtcOffset.php
similarity index 94%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/UtcOffset.php
index 4a1ffb158..f2d0d1700 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/UtcOffset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject\Property;
+namespace SabreForRainLoop\VObject\Property;
 
 /**
  * UtcOffset property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/Date.php
similarity index 85%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/Date.php
index 25356373a..ed3be9929 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/Date.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property\VCard;
+namespace SabreForRainLoop\VObject\Property\VCard;
 
 use
-    Sabre\VObject\DateTimeParser;
+    SabreForRainLoop\VObject\DateTimeParser;
 
 /**
  * Date property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateAndOrTime.php
similarity index 95%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateAndOrTime.php
index 805e5c3f9..f6d1fc36f 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateAndOrTime.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Property\VCard;
+namespace SabreForRainLoop\VObject\Property\VCard;
 
 use
-    Sabre\VObject\DateTimeParser,
-    Sabre\VObject\Property\Text;
+    SabreForRainLoop\VObject\DateTimeParser,
+    SabreForRainLoop\VObject\Property\Text;
 
 /**
  * DateAndOrTime property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateTime.php
similarity index 86%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateTime.php
index 759c40709..ae8ffd3f2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/DateTime.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property\VCard;
+namespace SabreForRainLoop\VObject\Property\VCard;
 
 use
-    Sabre\VObject\DateTimeParser;
+    SabreForRainLoop\VObject\DateTimeParser;
 
 /**
  * DateTime property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/LanguageTag.php
similarity index 92%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/LanguageTag.php
index ad5bb4157..03c5882ad 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/LanguageTag.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Sabre\VObject\Property\VCard;
+namespace SabreForRainLoop\VObject\Property\VCard;
 
 use
-    Sabre\VObject\Property;
+    SabreForRainLoop\VObject\Property;
 
 /**
  * LanguageTag property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/TimeStamp.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/TimeStamp.php
index 458451e34..00522dc3d 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Property/VCard/TimeStamp.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Property\VCard;
+namespace SabreForRainLoop\VObject\Property\VCard;
 
 use
-    Sabre\VObject\DateTimeParser,
-    Sabre\VObject\Property\Text;
+    SabreForRainLoop\VObject\DateTimeParser,
+    SabreForRainLoop\VObject\Property\Text;
 
 /**
  * TimeStamp property
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Reader.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Reader.php
similarity index 98%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Reader.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Reader.php
index 33d626033..89432f1f7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Reader.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Reader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * iCalendar/vCard/jCal/jCard reader object.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/RecurrenceIterator.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/RecurrenceIterator.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/RecurrenceIterator.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/RecurrenceIterator.php
index 9efbc1d60..5d6d8e2b7 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/RecurrenceIterator.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/RecurrenceIterator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * This class is used to determine new for a recurring event, when the next
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/ICalendar.php
similarity index 93%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/ICalendar.php
index 62e50489a..eb5db80b2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/ICalendar.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Splitter;
+namespace SabreForRainLoop\VObject\Splitter;
 
 use
-    Sabre\VObject,
-    Sabre\VObject\Component\VCalendar;
+    SabreForRainLoop\VObject,
+    SabreForRainLoop\VObject\Component\VCalendar;
 
 /**
  * Splitter
@@ -85,7 +85,7 @@ class ICalendar implements SplitterInterface {
      *
      * When the end is reached, null will be returned.
      *
-     * @return Sabre\VObject\Component|null
+     * @return SabreForRainLoop\VObject\Component|null
      */
     public function getNext() {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/SplitterInterface.php
similarity index 90%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/SplitterInterface.php
index c0126883a..116da8af2 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/SplitterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject\Splitter;
+namespace SabreForRainLoop\VObject\Splitter;
 
 /**
  * VObject splitter
@@ -32,7 +32,7 @@ interface SplitterInterface {
      *
      * When the end is reached, null will be returned.
      *
-     * @return Sabre\VObject\Component|null
+     * @return SabreForRainLoop\VObject\Component|null
      */
     function getNext();
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/VCard.php
similarity index 89%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/VCard.php
index 8d41ae3f5..31425fec4 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Splitter/VCard.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sabre\VObject\Splitter;
+namespace SabreForRainLoop\VObject\Splitter;
 
 use
-    Sabre\VObject,
-    Sabre\VObject\Parser\MimeDir;
+    SabreForRainLoop\VObject,
+    SabreForRainLoop\VObject\Parser\MimeDir;
 
 /**
  * Splitter
@@ -57,7 +57,7 @@ class VCard implements SplitterInterface {
      *
      * When the end is reached, null will be returned.
      *
-     * @return Sabre\VObject\Component|null
+     * @return SabreForRainLoop\VObject\Component|null
      */
     public function getNext() {
 
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/StringUtil.php
similarity index 97%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/StringUtil.php
index ea88e1e86..390113732 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/StringUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Useful utilities for working with various strings.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/TimeZoneUtil.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/TimeZoneUtil.php
index a7d51b629..590cf7d14 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/TimeZoneUtil.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * Time zone name translation
@@ -402,7 +402,7 @@ class TimeZoneUtil {
      * exception if we cannot accurately determine the timezone.
      *
      * @param string $tzid
-     * @param Sabre\VObject\Component $vcalendar
+     * @param SabreForRainLoop\VObject\Component $vcalendar
      * @return DateTimeZone
      */
     static public function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false) {
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/VCardConverter.php
similarity index 99%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/VCardConverter.php
index ffb0f9e9a..4b5d6d14e 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/VCardConverter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * This utility converts vcards from one version to another.
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Version.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Version.php
similarity index 91%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/Version.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Version.php
index efb129ac1..762836399 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/Version.php
+++ b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sabre\VObject;
+namespace SabreForRainLoop\VObject;
 
 /**
  * This class contains the version number for the VObject package
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/VObject/includes.php b/rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/includes.php
similarity index 100%
rename from rainloop/v/0.0.0/app/libraries/Sabre/VObject/includes.php
rename to rainloop/v/0.0.0/app/libraries/SabreForRainLoop/VObject/includes.php
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/ExceptionInterface.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/ExceptionInterface.php
deleted file mode 100644
index c212e664d..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @api
- */
-interface ExceptionInterface
-{
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php
deleted file mode 100644
index 15533db40..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/FileNotFoundException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception class thrown when a file couldn't be found
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- */
-class FileNotFoundException extends IOException
-{
-    public function __construct($message = null, $code = 0, \Exception $previous = null, $path = null)
-    {
-        if (null === $message) {
-            if (null === $path) {
-                $message = 'File could not be found.';
-            } else {
-                $message = sprintf('File "%s" could not be found.', $path);
-            }
-        }
-
-        parent::__construct($message, $code, $previous, $path);
-    }
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php
deleted file mode 100644
index 4b551af71..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * Exception class thrown when a filesystem operation failure happens
- *
- * @author Romain Neutron <imprec@gmail.com>
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @api
- */
-class IOException extends \RuntimeException implements IOExceptionInterface
-{
-    private $path;
-
-    public function __construct($message, $code = 0, \Exception $previous = null, $path = null)
-    {
-        $this->path = $path;
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
deleted file mode 100644
index de9f3e714..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem\Exception;
-
-/**
- * IOException interface for file and input/output stream releated exceptions thrown by the component.
- *
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- */
-interface IOExceptionInterface extends ExceptionInterface
-{
-    /**
-     * Returns the associated path for the exception
-     *
-     * @return string The path.
-     */
-    public function getPath();
-}
diff --git a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php b/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php
deleted file mode 100644
index 9e45d2ba3..000000000
--- a/rainloop/v/0.0.0/app/libraries/Symfony/Component/Filesystem/Filesystem.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Filesystem;
-
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Exception\FileNotFoundException;
-
-/**
- * Provides basic utility to manipulate the file system.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Filesystem
-{
-    /**
-     * Copies a file.
-     *
-     * This method only copies the file if the origin file is newer than the target file.
-     *
-     * By default, if the target already exists, it is not overridden.
-     *
-     * @param string  $originFile The original filename
-     * @param string  $targetFile The target filename
-     * @param boolean $override   Whether to override an existing file or not
-     *
-     * @throws FileNotFoundException    When orginFile doesn't exist
-     * @throws IOException              When copy fails
-     */
-    public function copy($originFile, $targetFile, $override = false)
-    {
-        if (stream_is_local($originFile) && !is_file($originFile)) {
-            throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
-        }
-
-        $this->mkdir(dirname($targetFile));
-
-        if (!$override && is_file($targetFile)) {
-            $doCopy = filemtime($originFile) > filemtime($targetFile);
-        } else {
-            $doCopy = true;
-        }
-
-        if ($doCopy) {
-            // https://bugs.php.net/bug.php?id=64634
-            $source = fopen($originFile, 'r');
-            $target = fopen($targetFile, 'w+');
-            stream_copy_to_stream($source, $target);
-            fclose($source);
-            fclose($target);
-            unset($source, $target);
-
-            if (!is_file($targetFile)) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
-            }
-        }
-    }
-
-    /**
-     * Creates a directory recursively.
-     *
-     * @param string|array|\Traversable $dirs The directory path
-     * @param integer                   $mode The directory mode
-     *
-     * @throws IOException On any directory creation failure
-     */
-    public function mkdir($dirs, $mode = 0777)
-    {
-        foreach ($this->toIterator($dirs) as $dir) {
-            if (is_dir($dir)) {
-                continue;
-            }
-
-            if (true !== @mkdir($dir, $mode, true)) {
-                throw new IOException(sprintf('Failed to create "%s".', $dir), 0, null, $dir);
-            }
-        }
-    }
-
-    /**
-     * Checks the existence of files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
-     *
-     * @return Boolean true if the file exists, false otherwise
-     */
-    public function exists($files)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if (!file_exists($file)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets access and modification time of file.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
-     * @param integer                   $time  The touch time as a unix timestamp
-     * @param integer                   $atime The access time as a unix timestamp
-     *
-     * @throws IOException When touch fails
-     */
-    public function touch($files, $time = null, $atime = null)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            $touch = $time ? @touch($file, $time, $atime) : @touch($file);
-            if (true !== $touch) {
-                throw new IOException(sprintf('Failed to touch "%s".', $file), 0, null, $file);
-            }
-        }
-    }
-
-    /**
-     * Removes files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
-     *
-     * @throws IOException When removal fails
-     */
-    public function remove($files)
-    {
-        $files = iterator_to_array($this->toIterator($files));
-        $files = array_reverse($files);
-        foreach ($files as $file) {
-            if (!file_exists($file) && !is_link($file)) {
-                continue;
-            }
-
-            if (is_dir($file) && !is_link($file)) {
-                $this->remove(new \FilesystemIterator($file));
-
-                if (true !== @rmdir($file)) {
-                    throw new IOException(sprintf('Failed to remove directory "%s".', $file), 0, null, $file);
-                }
-            } else {
-                // https://bugs.php.net/bug.php?id=52176
-                if (defined('PHP_WINDOWS_VERSION_MAJOR') && is_dir($file)) {
-                    if (true !== @rmdir($file)) {
-                        throw new IOException(sprintf('Failed to remove file "%s".', $file), 0, null, $file);
-                    }
-                } else {
-                    if (true !== @unlink($file)) {
-                        throw new IOException(sprintf('Failed to remove file "%s".', $file), 0, null, $file);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Change mode for an array of files or directories.
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change mode
-     * @param integer                   $mode      The new mode (octal)
-     * @param integer                   $umask     The mode mask (octal)
-     * @param Boolean                   $recursive Whether change the mod recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chmod($files, $mode, $umask = 0000, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
-            }
-            if (true !== @chmod($file, $mode & ~$umask)) {
-                throw new IOException(sprintf('Failed to chmod file "%s".', $file), 0, null, $file);
-            }
-        }
-    }
-
-    /**
-     * Change the owner of an array of files or directories
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change owner
-     * @param string                    $user      The new owner user name
-     * @param Boolean                   $recursive Whether change the owner recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chown($files, $user, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chown(new \FilesystemIterator($file), $user, true);
-            }
-            if (is_link($file) && function_exists('lchown')) {
-                if (true !== @lchown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the group of an array of files or directories
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change group
-     * @param string                    $group     The group name
-     * @param Boolean                   $recursive Whether change the group recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chgrp($files, $group, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chgrp(new \FilesystemIterator($file), $group, true);
-            }
-            if (is_link($file) && function_exists('lchgrp')) {
-                if (true !== @lchgrp($file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chgrp($file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Renames a file or a directory.
-     *
-     * @param string  $origin    The origin filename or directory
-     * @param string  $target    The new filename or directory
-     * @param Boolean $overwrite Whether to overwrite the target if it already exists
-     *
-     * @throws IOException When target file or directory already exists
-     * @throws IOException When origin cannot be renamed
-     */
-    public function rename($origin, $target, $overwrite = false)
-    {
-        // we check that target does not exist
-        if (!$overwrite && is_readable($target)) {
-            throw new IOException(sprintf('Cannot rename because the target "%s" already exists.', $target), 0, null, $target);
-        }
-
-        if (true !== @rename($origin, $target)) {
-            throw new IOException(sprintf('Cannot rename "%s" to "%s".', $origin, $target), 0, null, $target);
-        }
-    }
-
-    /**
-     * Creates a symbolic link or copy a directory.
-     *
-     * @param string  $originDir     The origin directory path
-     * @param string  $targetDir     The symbolic link name
-     * @param Boolean $copyOnWindows Whether to copy files if on Windows
-     *
-     * @throws IOException When symlink fails
-     */
-    public function symlink($originDir, $targetDir, $copyOnWindows = false)
-    {
-        if (!function_exists('symlink') && $copyOnWindows) {
-            $this->mirror($originDir, $targetDir);
-
-            return;
-        }
-
-        $this->mkdir(dirname($targetDir));
-
-        $ok = false;
-        if (is_link($targetDir)) {
-            if (readlink($targetDir) != $originDir) {
-                $this->remove($targetDir);
-            } else {
-                $ok = true;
-            }
-        }
-
-        if (!$ok) {
-            if (true !== @symlink($originDir, $targetDir)) {
-                $report = error_get_last();
-                if (is_array($report)) {
-                    if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($report['message'], 'error code(1314)')) {
-                        throw new IOException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');
-                    }
-                }
-
-                throw new IOException(sprintf('Failed to create symbolic link from "%s" to "%s".', $originDir, $targetDir), 0, null, $targetDir);
-            }
-        }
-    }
-
-    /**
-     * Given an existing path, convert it to a path relative to a given starting path
-     *
-     * @param string $endPath   Absolute path of target
-     * @param string $startPath Absolute path where traversal begins
-     *
-     * @return string Path of target relative to starting path
-     */
-    public function makePathRelative($endPath, $startPath)
-    {
-        // Normalize separators on windows
-        if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-            $endPath = strtr($endPath, '\\', '/');
-            $startPath = strtr($startPath, '\\', '/');
-        }
-
-        // Split the paths into arrays
-        $startPathArr = explode('/', trim($startPath, '/'));
-        $endPathArr = explode('/', trim($endPath, '/'));
-
-        // Find for which directory the common path stops
-        $index = 0;
-        while (isset($startPathArr[$index]) && isset($endPathArr[$index]) && $startPathArr[$index] === $endPathArr[$index]) {
-            $index++;
-        }
-
-        // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        $depth = count($startPathArr) - $index;
-
-        // Repeated "../" for each level need to reach the common path
-        $traverser = str_repeat('../', $depth);
-
-        $endPathRemainder = implode('/', array_slice($endPathArr, $index));
-
-        // Construct $endPath from traversing to the common path, then to the remaining $endPath
-        $relativePath = $traverser.(strlen($endPathRemainder) > 0 ? $endPathRemainder.'/' : '');
-
-        return (strlen($relativePath) === 0) ? './' : $relativePath;
-    }
-
-    /**
-     * Mirrors a directory to another.
-     *
-     * @param string       $originDir The origin directory
-     * @param string       $targetDir The target directory
-     * @param \Traversable $iterator  A Traversable instance
-     * @param array        $options   An array of boolean options
-     *                               Valid options are:
-     *                                 - $options['override'] Whether to override an existing file on copy or not (see copy())
-     *                                 - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
-     *                                 - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
-     *
-     * @throws IOException When file type is unknown
-     */
-    public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = array())
-    {
-        $targetDir = rtrim($targetDir, '/\\');
-        $originDir = rtrim($originDir, '/\\');
-
-        // Iterate in destination folder to remove obsolete entries
-        if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
-            $deleteIterator = $iterator;
-            if (null === $deleteIterator) {
-                $flags = \FilesystemIterator::SKIP_DOTS;
-                $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
-            }
-            foreach ($deleteIterator as $file) {
-                $origin = str_replace($targetDir, $originDir, $file->getPathname());
-                if (!$this->exists($origin)) {
-                    $this->remove($file);
-                }
-            }
-        }
-
-        $copyOnWindows = false;
-        if (isset($options['copy_on_windows']) && !function_exists('symlink')) {
-            $copyOnWindows = $options['copy_on_windows'];
-        }
-
-        if (null === $iterator) {
-            $flags = $copyOnWindows ? \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS : \FilesystemIterator::SKIP_DOTS;
-            $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST);
-        }
-
-        foreach ($iterator as $file) {
-            $target = str_replace($originDir, $targetDir, $file->getPathname());
-
-            if ($copyOnWindows) {
-                if (is_link($file) || is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            } else {
-                if (is_link($file)) {
-                    $this->symlink($file, $target);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } elseif (is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns whether the file path is an absolute path.
-     *
-     * @param string $file A file path
-     *
-     * @return Boolean
-     */
-    public function isAbsolutePath($file)
-    {
-        if (strspn($file, '/\\', 0, 1)
-            || (strlen($file) > 3 && ctype_alpha($file[0])
-                && substr($file, 1, 1) === ':'
-                && (strspn($file, '/\\', 2, 1))
-            )
-            || null !== parse_url($file, PHP_URL_SCHEME)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Atomically dumps content into a file.
-     *
-     * @param  string  $filename The file to be written to.
-     * @param  string  $content  The data to write into the file.
-     * @param  integer $mode     The file mode (octal).
-     * @throws IOException       If the file cannot be written to.
-     */
-    public function dumpFile($filename, $content, $mode = 0666)
-    {
-        $dir = dirname($filename);
-
-        if (!is_dir($dir)) {
-            $this->mkdir($dir);
-        } elseif (!is_writable($dir)) {
-            throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
-        }
-
-        $tmpFile = tempnam($dir, basename($filename));
-
-        if (false === @file_put_contents($tmpFile, $content)) {
-            throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
-        }
-
-        $this->rename($tmpFile, $filename, true);
-        $this->chmod($filename, $mode);
-    }
-
-    /**
-     * @param mixed $files
-     *
-     * @return \Traversable
-     */
-    private function toIterator($files)
-    {
-        if (!$files instanceof \Traversable) {
-            $files = new \ArrayObject(is_array($files) ? $files : array($files));
-        }
-
-        return $files;
-    }
-}