merge_tag manager typo
started to add metadata for template tags
modified template entity
body split into html and css