..
Merge branch 'master' of https://github.com/datawrapper/datawrapper

Conflicts:
	scripts/render.js
..
Merge branch 'master' of https://github.com/datawrapper/datawrapper
Merge branch 'master' of https://github.com/datawrapper/datawrapper
forwarding to docs.datawrapper.de in .htaccess
Merge branch 'master' of https://github.com/datawrapper/datawrapper