ProdcuctOrderItem clean up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/secured/api-docs/swagger-file.json