#1957 Modifications to product and sku sales history tabs (changed columns and hid event-specific columns for non-event products)
Merge branch 'develop' into develop-products
Merge remote-tracking branch 'origin/develop' into feature-skubundles
Added new sku settings. Closes #1973.
Merge branch 'develop' into develop-products
Merge branch 'develop' into develop-products
Merge branch 'develop' into develop-products
Progress on #1985 - add registrant accounts for event order items
Progress on #1969 - Adjust event registrations based on submitted order item quantity
Closes #1973 - Removed unneeded skuBundleInventory setting
Closes #1986 - changed address service copyaddress phone reference to phoneNumber
Fixes for #1985 - Changed some incorrect property references and remove event registration addition from order placement
Merge branch 'develop-products' into feature-events

Conflicts:
	model/service/AddressService.cfc
Closes #1973 - Removed unneeded skuBundleInventory setting
Working on collection setup
#1992 Started adding event statuses. Misc small fixes.
Merge branch 'develop' into develop-products
Merge branch 'develop-products' into feature-skubundles

Conflicts:
	model/report/OrderItemReport.cfc
	model/service/AccountService.cfc
Merge branch 'develop-products' into feature-events

Conflicts:
	model/service/AccountService.cfc
Updated Version