Removed all UUID's so that dups don't get used by accident.  Updated
Version 3.1.12.012
Merge branch 'develop' into feature-events

Conflicts:
	config/dbdata/SlatwallFulfillmentMethod.xml.cfm
	config/dbdata/SlatwallProductType.xml.cfm
	config/dbdata/SlatwallSetting.xml.cfm
	config/dbdata/SlatwallType.xml.cfm