Fixed the issue where display names with comma in the value were rendered strangely.
Merge branch 'master' into GREETING-W-COMMA
Merge pull request #47 from Unicon/GREETING-W-COMMA

Fixed the issue where display names with comma in the value were rendered strangely.
Merge branch 'master' into heroku