#129
#129 edit.xhtml
#129 properties
Merge commit 'f2a9141abebdc1423f4c2ee0131205f0795d049e' into Internationalisierung
test
Merge branch 'Internationalisierung' of
https://github.com/britzke/archivator.git into Internationalisierung

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