Merge branch 'master' into develop
Case 2651 - Set proper classes.
Merge branch 'case-2651' into develop

* case-2651:
  Case 2651 - Set proper classes.
case 2758 - Replacing check_plain with htmlspecialchars.
case 2758 - Removed space from function call.
Merge branch 'case-2758' into develop
Merge branch 'develop'