Fix typo in "Rights Management"
Added Sync App for Android using CalDAV
Added an additonal Android CardDAV Sync approach
Merge pull request #166 from red-hood/website_rights_typo

Fix typo in "Rights Management"
Merge pull request #167 from happyheart/patch-1

Added Sync App for Android using CalDAV
Typo fixes in doc
Other small fixes for CalendarSync doc
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