Fixed vcardurl field length.
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
	examples/sql/pgsql.principals.sql
	lib/Sabre/DAV/Version.php
	lib/Sabre/DAVACL/Version.php