conflict handling
RR
Merge branch 'master' of https://github.com/ffhs/privatecloud

Conflicts:
	PrivateCloudFFHS/gen/ch/ffhs/privatecloudffhs/R.java
	PrivateCloudFFHS/src/ch/ffhs/privatecloudffhs/ActivityEditFolder.java
	PrivateCloudFFHS/src/ch/ffhs/privatecloudffhs/adapter/ConflictListAdapter.java