Remove getItemLocationByFulfiller
Made location identification consistent
Fixed some cardinality issues
Merge branch 'master' into aperture-science

Conflicts:
	core.wsdl