modify show template
fix tabs
Merge remote-tracking branch 'upstream/master'
change block name entity->object
Merge pull request #355 from cykus/master

Makes show template more flexible to override