Final strings manipulation.
Merge branch 'message_center_1_0' into ent_surveys
Merge branch 'message_center_1_0'
Merge branch 'master' into ent_surveys
Merge branch 'ent_surveys' into dialog_surveys_2
Fix indirect merge conflict.