Added 5.3.1 to travis builds, as this is the oldest supported version.
Merge branch '1.6' into 1.7
Merge branch '1.7' into 1.8
Looks like PHP 5.3.1 doesn't exist on travis. 5.3.3 should though.
Merge branch '1.6' into 1.7
Merge branch '1.7' into 1.8
Added PHP 5.5 to travis testing list.
Merge branch '1.5' into 1.6
Merge branch '1.6' into 1.7
Merge branch '1.7' into 1.8
Merge branch '1.8'

Conflicts:
	.travis.yml
Updated to latest phpdoc_md
Merge branch '1.8'
Differentiating between modifications and additions.
Initial sync should put everything in 'added', not 'modified'.
Fixed outbox delegation bug
Merge branch 'outbox-delegation-fix'
Now verifying the originator against the currently logged in user,

instead of the owner of the outbox.
Merge branch 'outbox-delegation-fix'
Fixed a WebDAV-Sync problem.

This should fix CardDAV-Sync problems.