Fix return order error.

Resolves issue https://github.com/ten24/Slatwall/issues/2371. Let me
know if this is not the best way to resolve this. Just trying to fix
what I can.
Add missing parenthesis to last commit.
more fixes

access CompanyPaymentMethodFlag directly from orderPayment.
Fixed some tabGroupItems, removed unnecessary hibachiEntityDetailForm
Merge pull request #2384 from ten24/feature-4-uiexamples

Feature 4 uiexamples
Merge pull request #2383 from ten24/feature-4-initialTabFixes

Fixed some tabGroupItems, removed unnecessary hibachiEntityDetailForm
Merge remote-tracking branch 'jsieber-aca/hotfix-bugFixreturnOrder' into hotfix
Merge branch 'hotfix'
Updated Version 3.4.019
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-4

Conflicts:
	version.txt
Removed HibachiEntityDetailForm tags from basic.cfm files
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into feature-4-initialTabFixes
Merge pull request #2385 from ten24/feature-4-initialTabFixes

Feature 4 initial tab fixes
validating client side and server side with inline feedback
fixing pagination bugs
fixing bug where filters with empty strings were not working
show a Close Group message when filter is open
extra > at the end
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections