fixed mutex bug, added condition for active troop state
Merge branch 'ecgprc_sprint3'