Merge branch 'c4c.staging.editschool' into pulse_cdm
Require permission for discover contacts
Merge branch 'c4c.staging.hotfix' into c4c.staging