Mapping DTO
Merge branch 'master' of https://github.com/productys/mes-eworkshop

Conflicts:
	eworkshop/eworkshop-admin/.classpath
	eworkshop/eworkshop-admin/.settings/org.eclipse.wst.common.component