- new selective update of delete and conflict change operations
- first implementation of admin/edit differences
fixes  Issue 432: 	No write permission error if you want to undo a
delete of resource or event where you are not the owner
Merge branch 'master' of https://code.google.com/p/rapla

Conflicts:
	.classpath