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

Conflicts:
	PrivateCloudFFHS/AndroidManifest.xml
	PrivateCloudFFHS/gen/ch/ffhs/privatecloudffhs/R.java
	PrivateCloudFFHS/res/values/strings.xml
	PrivateCloudFFHS/src/ch/ffhs/privatecloudffhs/ActivityServer.java