More robust planMan TMR check
Merge branch 'master'

Conflicts:
	plan_selection/planManager.py