Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us2_copy_files

Conflicts:
	.gitmodules
	owncloud-android-library
	res/values/strings.xml