No more than 10 hours per week, teacher and promotion
UI changes
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/datas/mediumdataset3.cpp