Added taxIntegrationOptions property to TaxCategoryRate.cfc
Fixed taxintegration property
Merge pull request #2166 from ten24/feature-taxintegration-ds

Feature taxintegration ds
Notes for Jubs
Added helper function to TaxCategory.cfc and properties to
Integration.cfc
Went through first round of todo's
Added PaymentTest to Integration Tabs
Added hibachiActionCaller in detailtaxcategoryrate.cfm
Prepared slatwall for a tax intergration
Went through comments
PaymentMethod Smartlist and IntService ActiveFW1 Smartlist
Fixed a shipping int smartlist
fixed subsys error in admin/layout/default by changing to 'package'
yep
Fixed up modified smartlists
Merge branch 'develop' into feature-taxintegration
Merge remote-tracking branch 'origin/feature-taxintegration-ds' into feature-taxintegration
Added comments to Tax Service.
Merge branch 'develop' into feature-taxintegration

Conflicts:
	config/scripts/database/activeFlags.cfm
Added BaseTax.cfc, TaxInterface.cfc, etc