Merge branch 'hotfix/template-rewrite' into develop
Merge branch 'develop' of github.com:edewit/errai into develop