Manually making the changes in pull request #1351
Added back some delay code that went missing
Merge remote-tracking branch 'Ten24/rc3' into feature-listingdisplaysearch
Adds setting for listing display header to be optional
Removed header from a few account attributes
Fixed a style/colspan issues
Merge branch 'rc3' of https://github.com/ten24/Slatwall into feature-listingdisplaysearch
Small bug fix
Added smartlist overide to enable search on the order view page
Filters some keyup codes for listing display update
Merge branch 'rc3' of https://github.com/ten24/Slatwall into feature-listingdisplaysearch
Merge branch 'rc3' of https://github.com/ten24/Slatwall into feature-listingdisplaysearch

Conflicts:
	model/service/OrderService.cfc
Resolved by manual merge
Merged In Develop
Merge branch 'develop' into feature-listingdisplaysearch

Conflicts:
	model/entity/OrderItem.cfc
	org/Hibachi/HibachiAssets/css/global.css
Merge branch 'feature-listingdisplaysearch' of https://github.com/ten24/Slatwall into feature-listingdisplaysearch

Conflicts:
	model/service/OrderService.cfc
Merge remote-tracking branch 'Ten24/develop' into feature-listingdisplaysearch
Merge remote-tracking branch 'dzikakis/rc3' into feature-listingdisplaysearch
Merge remote-tracking branch 'dzikakis/rc3' into feature-listingdisplaysearch
Fixes issue #1786
Merge remote-tracking branch 'Ten24/develop' into feature-listingdisplaysearch
Merge branch 'develop' into feature-listingdisplaysearch
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into feature-listingdisplaysearch