Fiddle with Strings once again.
Merge branch 'message_center_1_0' into ent_surveys
Merge branch 'ent_surveys' into dialog_surveys