Added check to State Diagram for transition properties.
Merge branch 'oosd_danny'