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