Happy new year :)
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	LICENSE
	lib/Sabre/CalDAV/Backend/AbstractBackend.php
	lib/Sabre/CalDAV/Backend/BackendInterface.php
	lib/Sabre/CalDAV/Backend/NotificationSupport.php
	lib/Sabre/CalDAV/Backend/PDO.php
	lib/Sabre/CalDAV/Backend/SharingSupport.php
	lib/Sabre/CalDAV/Calendar.php
	lib/Sabre/CalDAV/CalendarObject.php
	lib/Sabre/CalDAV/CalendarQueryParser.php
	lib/Sabre/CalDAV/CalendarQueryValidator.php
	lib/Sabre/CalDAV/CalendarRootNode.php
	lib/Sabre/CalDAV/Exception/InvalidComponentType.php
	lib/Sabre/CalDAV/ICSExportPlugin.php
	lib/Sabre/CalDAV/ICalendar.php
	lib/Sabre/CalDAV/ICalendarObject.php
	lib/Sabre/CalDAV/IShareableCalendar.php
	lib/Sabre/CalDAV/ISharedCalendar.php
	lib/Sabre/CalDAV/Notifications/Collection.php
	lib/Sabre/CalDAV/Notifications/ICollection.php
	lib/Sabre/CalDAV/Notifications/INode.php
	lib/Sabre/CalDAV/Notifications/INotificationType.php
	lib/Sabre/CalDAV/Notifications/Node.php
	lib/Sabre/CalDAV/Notifications/Notification/Invite.php
	lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
	lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
	lib/Sabre/CalDAV/Plugin.php
	lib/Sabre/CalDAV/Principal/Collection.php
	lib/Sabre/CalDAV/Principal/ProxyRead.php
	lib/Sabre/CalDAV/Principal/ProxyWrite.php
	lib/Sabre/CalDAV/Principal/User.php
	lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
	lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
	lib/Sabre/CalDAV/Property/SupportedCalendarData.php
	lib/Sabre/CalDAV/Property/SupportedCollationSet.php
	lib/Sabre/CalDAV/Schedule/IMip.php
	lib/Sabre/CalDAV/Schedule/IOutbox.php
	lib/Sabre/CalDAV/Schedule/Outbox.php
	lib/Sabre/CalDAV/ShareableCalendar.php
	lib/Sabre/CalDAV/SharedCalendar.php
	lib/Sabre/CalDAV/SharingPlugin.php
	lib/Sabre/CalDAV/UserCalendars.php
	lib/Sabre/CalDAV/Version.php
	lib/Sabre/CalDAV/includes.php
	lib/Sabre/CardDAV/AddressBook.php
	lib/Sabre/CardDAV/AddressBookQueryParser.php
	lib/Sabre/CardDAV/AddressBookRoot.php
	lib/Sabre/CardDAV/Backend/BackendInterface.php
	lib/Sabre/CardDAV/Backend/PDO.php
	lib/Sabre/CardDAV/Card.php
	lib/Sabre/CardDAV/IAddressBook.php
	lib/Sabre/CardDAV/ICard.php
	lib/Sabre/CardDAV/IDirectory.php
	lib/Sabre/CardDAV/Plugin.php
	lib/Sabre/CardDAV/Property/SupportedAddressData.php
	lib/Sabre/CardDAV/UserAddressBooks.php
	lib/Sabre/CardDAV/VCFExportPlugin.php
	lib/Sabre/CardDAV/Version.php
	lib/Sabre/CardDAV/includes.php
	lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
	lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
	lib/Sabre/DAV/Auth/Backend/Apache.php
	lib/Sabre/DAV/Auth/Backend/BackendInterface.php
	lib/Sabre/DAV/Auth/Backend/File.php
	lib/Sabre/DAV/Auth/Backend/PDO.php
	lib/Sabre/DAV/Auth/Plugin.php
	lib/Sabre/DAV/Browser/GuessContentType.php
	lib/Sabre/DAV/Browser/MapGetToPropFind.php
	lib/Sabre/DAV/Browser/Plugin.php
	lib/Sabre/DAV/Client.php
	lib/Sabre/DAV/Collection.php
	lib/Sabre/DAV/Exception.php
	lib/Sabre/DAV/Exception/BadRequest.php
	lib/Sabre/DAV/Exception/Conflict.php
	lib/Sabre/DAV/Exception/ConflictingLock.php
	lib/Sabre/DAV/Exception/FileNotFound.php
	lib/Sabre/DAV/Exception/Forbidden.php
	lib/Sabre/DAV/Exception/InsufficientStorage.php
	lib/Sabre/DAV/Exception/InvalidResourceType.php
	lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
	lib/Sabre/DAV/Exception/Locked.php
	lib/Sabre/DAV/Exception/MethodNotAllowed.php
	lib/Sabre/DAV/Exception/NotAuthenticated.php
	lib/Sabre/DAV/Exception/NotFound.php
	lib/Sabre/DAV/Exception/NotImplemented.php
	lib/Sabre/DAV/Exception/PaymentRequired.php
	lib/Sabre/DAV/Exception/PreconditionFailed.php
	lib/Sabre/DAV/Exception/ReportNotSupported.php
	lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
	lib/Sabre/DAV/Exception/UnsupportedMediaType.php
	lib/Sabre/DAV/FS/Directory.php
	lib/Sabre/DAV/FS/File.php
	lib/Sabre/DAV/FS/Node.php
	lib/Sabre/DAV/FSExt/Directory.php
	lib/Sabre/DAV/FSExt/File.php
	lib/Sabre/DAV/FSExt/Node.php
	lib/Sabre/DAV/File.php
	lib/Sabre/DAV/ICollection.php
	lib/Sabre/DAV/IExtendedCollection.php
	lib/Sabre/DAV/IFile.php
	lib/Sabre/DAV/INode.php
	lib/Sabre/DAV/IProperties.php
	lib/Sabre/DAV/IQuota.php
	lib/Sabre/DAV/Locks/Backend/BackendInterface.php
	lib/Sabre/DAV/Locks/Backend/File.php
	lib/Sabre/DAV/Locks/Backend/PDO.php
	lib/Sabre/DAV/Locks/LockInfo.php
	lib/Sabre/DAV/Locks/Plugin.php
	lib/Sabre/DAV/Mount/Plugin.php
	lib/Sabre/DAV/Node.php
	lib/Sabre/DAV/ObjectTree.php
	lib/Sabre/DAV/PartialUpdate/IFile.php
	lib/Sabre/DAV/PartialUpdate/Plugin.php
	lib/Sabre/DAV/Property.php
	lib/Sabre/DAV/Property/GetLastModified.php
	lib/Sabre/DAV/Property/Href.php
	lib/Sabre/DAV/Property/HrefList.php
	lib/Sabre/DAV/Property/IHref.php
	lib/Sabre/DAV/Property/LockDiscovery.php
	lib/Sabre/DAV/Property/ResourceType.php
	lib/Sabre/DAV/Property/Response.php
	lib/Sabre/DAV/Property/ResponseList.php
	lib/Sabre/DAV/Property/SupportedLock.php
	lib/Sabre/DAV/Property/SupportedReportSet.php
	lib/Sabre/DAV/PropertyInterface.php
	lib/Sabre/DAV/Server.php
	lib/Sabre/DAV/ServerPlugin.php
	lib/Sabre/DAV/SimpleCollection.php
	lib/Sabre/DAV/SimpleFile.php
	lib/Sabre/DAV/StringUtil.php
	lib/Sabre/DAV/TemporaryFileFilterPlugin.php
	lib/Sabre/DAV/Tree.php
	lib/Sabre/DAV/Tree/Filesystem.php
	lib/Sabre/DAV/URLUtil.php
	lib/Sabre/DAV/UUIDUtil.php
	lib/Sabre/DAV/Version.php
	lib/Sabre/DAV/XMLUtil.php
	lib/Sabre/DAV/includes.php
	lib/Sabre/DAVACL/AbstractPrincipalCollection.php
	lib/Sabre/DAVACL/Exception/AceConflict.php
	lib/Sabre/DAVACL/Exception/NeedPrivileges.php
	lib/Sabre/DAVACL/Exception/NoAbstract.php
	lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
	lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
	lib/Sabre/DAVACL/IACL.php
	lib/Sabre/DAVACL/IPrincipal.php
	lib/Sabre/DAVACL/Plugin.php
	lib/Sabre/DAVACL/Principal.php
	lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
	lib/Sabre/DAVACL/PrincipalBackend/PDO.php
	lib/Sabre/DAVACL/PrincipalCollection.php
	lib/Sabre/DAVACL/Property/Acl.php
	lib/Sabre/DAVACL/Property/AclRestrictions.php
	lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
	lib/Sabre/DAVACL/Property/Principal.php
	lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
	lib/Sabre/DAVACL/Version.php
	lib/Sabre/DAVACL/includes.php
	lib/Sabre/HTTP/AWSAuth.php
	lib/Sabre/HTTP/AbstractAuth.php
	lib/Sabre/HTTP/BasicAuth.php
	lib/Sabre/HTTP/DigestAuth.php
	lib/Sabre/HTTP/Request.php
	lib/Sabre/HTTP/Response.php
	lib/Sabre/HTTP/Util.php
	lib/Sabre/HTTP/Version.php
	lib/Sabre/HTTP/includes.php
	tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
	tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
	tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
	tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
	tests/Sabre/CalDAV/Issue203Test.php
	tests/Sabre/CalDAV/Issue205Test.php
	tests/Sabre/CalDAV/Issue211Test.php
	tests/Sabre/CalDAV/Issue220Test.php
	tests/Sabre/CalDAV/Issue228Test.php
	tests/Sabre/CalDAV/Schedule/IMip/Mock.php
	tests/Sabre/DAVServerTest.php
Happy new year!