save
save
修改新的gui界面
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
	DCOPSolver/src/com/cqu/settings/DialogSettings.java