Merge
Merge branch 'dev' of https://github.com/k-int/Optician2020-minifactories into dev

Conflicts:
	o2020/grails-app/controllers/o2020/ApiController.groovy