Merge branch 'develop' of github.com:owncloud/android into us21_quota_visualization

Conflicts:
	owncloud-android-library