Merge branch '122-fix-xss-issues' into 'dev'

Apply html escape for main mako template

Closes #122

See merge request !98