Merge pull request #10 from heniancheng/master

Merge
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	DCOPSolver/dfsTree.txt
修正界面小错误
save
save
1.更新了界面，添加了重定向Console输出至文本框
2.完成了AgileDPOP的基本框架，需要测试排除bug
save
save
Merge remote-tracking branch 'upstream/master' into temp

Conflicts:
	DCOPSolver/dfsTree.txt