Send appropriate Accept/Content-Type headers + tests (closes #328)
Merge branch 'master' of github.com:rfc2822/davdroid
Allow adb backups (not Google cloud backups!) for DAVdroid because of user request
Added Chinese Simplified translation.
Merge pull request #338 from phy25/values-zh-CN

Add Chinese Simplified translation. Thanks to @phy25
Use new ical4j version to fix timezone bug

* use ical4j 1.0.x-maintenance (self-compiled 27 Oct 2014)
* upstream fixes timezone bug (fixes #186)
* try to turn off the check for time zone updates because it's unnecessary in most cases (fixes #239)
* mention ical4j and its major version in generated iCalendars
* update to ez-vcard 0.9.6 from upstream
* version bump to 0.6.4
Merge branch 'master' of github.com:rfc2822/davdroid
Ensure trailing slashes are always used for collections + tests
Add TLS cipher info to tests (see #344)
Set reasonable TLS settings

* disallow SSLv3
* allow more secure ciphers (closes #344)
* version bump to 0.6.5
Ensure trailing slash on user-given base URL (assuming users will always provide collections or base paths)
Mention Chinese translator
Merge https://github.com/bitfireAT/davdroid

Conflicts:
	src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java