k
Merge branch 'master' of https://github.com/Berger1994/TeamWork/

Conflicts:
	TeamWork/WebContent/index.xhtml