finished transitions
Merge branch 'master' of http://github.com/tjflexmaster/UAV_ROLE_MODEL.git
Transitions complete