Correct TrackProperties Dialog Z-order.
Merge branch 'master' into refactoring

Conflicts:
	include/TrackPropDlg.h