Fix correctly escape HTML entities if they exist.
Merge branch 'master' of github.com:javaBin/ems-redux