conference class changes v2
Merge branch 'master' of https://github.com/nunyabusiness/nunyabusiness