merge
Merge branch 'master' of https://github.com/tmmortensen/CDIO53.git

Conflicts:
	CDIO_3-uger/admin/admin/data/ProductBatchDTO.java