Working on Location Updates
Added properties to location entity and added activeFlag to list location
Merge branch 'rc3' into feature-events
Merge branch 'rc3' into feature-events
locationconfig
Removed Trace
Working through location issues & also added the location configuration
settings
Added Location Configurations
Added location configuration tabs
add ability to add location addresses
Merge branch 'rc3' into feature-events

Conflicts:
	model/entity/Setting.cfc
	model/service/SettingService.cfc
Added attrvalues to Location, added location to slat wall types, defined  primary location address in contact details.
Removed location address from contact detail and moved to location. Added ability to select primary address.
Added event product type
Added attribute values to locationConfiguration
Added attribute values and validation to location configuration
Abbreviated sku inventory headers  and added rollover tooltips with full header titles
Added expandable location ski inventory
Merge branch 'develop' into feature-events

Conflicts:
	admin/views/entity/detaillocation.cfm
	admin/views/entity/listlocation.cfm
	admin/views/entity/skutabs/inventory.cfm
	config/dbdata/SlatwallType.xml.cfm
	config/scripts/database/activeFlags.cfm
Merge branch 'develop' into feature-events