.
Merge branch 'master' of https://github.com/AppProjekt/WebApp.git

Conflicts:
	Museumsgude/WebContent/resources/js/texte.js