Merge branch 'master' into develop
Case 2651 - Fixed css classes and links, code review.
Case 2651 - Removed hacks.
Merge branch 'case-2651' into develop

* case-2651:
  Case 2651 - Removed hacks.
  Case 2651 - Fixed css classes and links, code review.
Merge branch 'develop'