Code format fix.
Fix extra counting of facilitators.
Merge branch 'develop'