Zeigen des Merge Conflict
Merge branch 'master' of https://github.com/Managemato/webapp.git

Conflicts:
	src/main/webapp/index.xhtml