Model archiválie

Conflicts:
	common/src/main/java/base.properties