Eclipse metadata fixes for vme rsg web.
Moving reference types in the same package and subsequent refactoring.
Merge remote-tracking branch 'origin/updated_model'

Conflicts:
	vme-service/src/main/java/org/fao/fi/vme/batch/sync2/mapping/xml/FigisDocBuilder.java