Fixed Wattball Re-scheduling

Only reschedules if no team/pitch/umpire collisions.  Another available
umpire is found if there is a collision or the current umpire is
unavailable.
Umpire visibility in rescheduling and umpire match list in umpire management
Merge branch 'blair'