Merge branch 'case-2482' into develop

* case-2482:
  Case 2482 - Removed hacks from template.
  Case 2482 - Fixed HTML problems.

Conflicts:
	ting.theme.inc