Merge branch 'message_center_1_0'
Merge branch 'master' into ent_surveys