Case 2480 - Removed duplicate 'class' attribute.
Case 2480 - Removed dirty hacks.
Merge branch 'case-2480' into develop

* case-2480:
  Case 2480 - Removed dirty hacks.
  Case 2480 - Removed duplicate 'class' attribute.

Conflicts:
	ting.theme.inc
	ting_object.tpl.php