Clean markup in templates
Revert "Clean markup in templates"

This reverts commit 8413a63f7d9df2695653ab2ef1d77927da6ddc55.
Clean markup
Clean up the templates markup
Restore config modifications related to #162
Add SHAARLI support to view template
Revert "Add SHAARLI support to view template"

This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8.
Add SHAARLI support to view template
resolve conflicts