don't show inactive members on roster
fix case (step1)
fix case (step2)
Merge branch 'master' into develop