Add tabs on the item display template
Merge remote-tracking branch 'origin/master'