Integration with Fabio's work
Merge branch 'master' of https://github.com/openfigis/vme.git

Conflicts:
	vme-web/.settings/org.eclipse.wst.common.component