table.xhtml Internationalisierung
Merge branch 'master' of https://github.com/guetar/web_engineering_3

Conflicts:
	src/main/resources/i18n_de.properties
	src/main/resources/i18n_en.properties
	src/main/webapp/table.xhtml
fixed merge
Merge branch 'master' of https://github.com/guetar/web_engineering_3

Conflicts:
	src/main/webapp/table.xhtml