Merge branch 'master' into develop
Case 2844 - Added check to tpl.
case 2862 - Fix anchor links.
Merge branch 'case-2862' into develop

* case-2862:
  case 2862 - Fix anchor links.
Merge branch 'case-2844' into develop

* case-2844:
  Case 2844 - Added check to tpl.

Conflicts:
	ting_relation.tpl.php
case 2862 - Better handling of ID uniquness.
Merge branch 'case-2862' into develop

* case-2862:
  case 2862 - Better handling of ID uniquness.
Merge branch 'develop' of github.com:artesis/ting_relation into develop

* 'develop' of github.com:artesis/ting_relation:
  Case 2844 - Added check to tpl.

Conflicts:
	ting_relation.tpl.php
case 2915 - Changing display for ispartof.
case 2915 - Changed ting relation to use user_list view type.
Merge branch 'v1.9.6-hotfix' into develop
Merge branch 'develop'