framework setup
Merge branch 'master' of https://github.com/epha/verordnung

Conflicts:
	elements/xesting.html