Merge pull request #3 from inthause/master

Fix web template rendering
Fix Highlight block backoffice edition