#129 edit.xhtml
#129 detail.xhtml
Merge branch 'Internationalisierung' of
https://github.com/britzke/archivator.git into Internationalisierung
Merge branch 'Internationalisierung' of
https://github.com/britzke/archivator.git into Internationalisierung

Conflicts:
	src/main/webapp/WEB-INF/templates/detail.xhtml