:
iasdsaMerge branch 'master' of https://github.com/ffhs/privatecloud

Conflicts:
	PrivateCloudFFHS/res/values/strings.xml