Conflicts:
	include/class_CopyPasteHandler.inc
	include/class_userinfo.inc
	include/simpleplugin/class_simpleManagement.inc