Added an additonal Android CardDAV Sync approach
Merge branch 'patch-2' of git://github.com/happyheart/Radicale into happyheart-patch-2

Conflicts:
	pages/user_documentation.rst
Merge branch 'happyheart-patch-2' into website