[ENH] display category name in top bar if available (MAGENTO-474)
[ENH] added option for displaying the template and class as html-comment. Use options: 'dev/debug/template_hints_as_comment' and 'dev/debug/template_hints_as_comment_with_surrounding_div'
Merge branch 'refs/heads/feature/templates_as_comment' into unlooped
Merge branch 'refs/heads/feature/ticket-474' into unlooped