Testing vobject 3.1
Merge branch '1.7' into 1.8
Possible fix for dealing with usernames with spaces in them.
Potential fix for Issue #365. Could you test this @tanghus?
Actual fix for Issue #365
Updated changelog
Bumped versions.
Revert "Actual fix for Issue #365"

This reverts commit a981d710a7d76bbc8b716c3a6f4d3cded09cc33e.
Much more elegant fix for Issue #365.
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	lib/Sabre/CalDAV/Version.php
	lib/Sabre/CardDAV/Version.php
	lib/Sabre/DAV/Version.php
	lib/Sabre/DAVACL/Version.php
Bumped versions, updated changelog.
Merge branch '1.8'

Conflicts:
	ChangeLog
	lib/Sabre/CalDAV/Version.php
	lib/Sabre/DAV/Version.php
	lib/Sabre/DAVACL/Version.php
Fixed Issue #367
Merge branch '1.7' into 1.8

Conflicts:
	lib/Sabre/CardDAV/Plugin.php
Bumped version.
Merge branch '1.8'

Conflicts:
	lib/Sabre/CardDAV/Version.php
	tests/Sabre/CardDAV/ValidateVCardTest.php
Refactored updating files a bit so it's easier to invoke.
Merge remote-tracking branch 'upstream/master' into calendar-managed-attachments
adding an attachment and updating its calendar object