#id for uid, default nature is "property"
Merge branch 'master' of https://github.com/revolutionarysystems/o-test

Conflicts:
	ec/xml-models/productTemplate.xml
#Test data includes refType="name"