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

Conflicts:
	Planning/beans/planning.cpp
	Planning/datas/mediumdataset3.cpp
	Planning/intelligence/parameters.cpp