Merge conflicts
Merge branch 'planner' of https://github.com/gautsson/elitresse into planner

Conflicts:
	python/planning.py