rged
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/datas/mediumdataset1.cpp
	Planning/datas/mediumdataset2.cpp
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/intelligence/intelligence.cpp
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/beans/planning.cpp