[tx-robot] updated from transifex
[tx-robot] updated from transifex
Update reference to library after upgrading TLS support
Merge pull request #729 from owncloud/tls_v1.1_and_v1.2_support

Update reference to library after upgrading TLS support
[tx-robot] updated from transifex
Merge branch 'develop' of github.com:owncloud/android into develop

Conflicts:
	owncloud-android-library
Merge branch 'develop' of github.com:owncloudChalmers/android into develop