fixed template generation
updated messages
Merge branch 'develop' of github.com:datawrapper/datawrapper into develop

specially if it merges an updated upstream into a topic branch.