Resolved merge conflict
Resolved merge conflict in tpl file
case 2915 - Changing display for ispartof.
case 2915 - Changed ting relation to use user_list view type.