First pass at tag replace
Couple more examples
Added imports first wave
Imports finished
replaced cf_hibachi's in admin/views/entity
Searched and replaced all cf_Hibachi with hb:Hibachi and added imports
SWA: replacements
Undid cfassociate basetag attributes
Merge pull request #2601 from ten24/hotfix-customtags-jubs

Hotfix customtags jubs
Removed customTag application settings
Merge branch 'hotfix' into hotfix-customtags
Merge branch 'hotfix' into hotfix-customtags
Merge branch 'hotfix' into hotfix-customtags
Fixes cfimport for hibachi reports
Updated Version 3.5.012.015
Merge branch 'hotfix-customtags'

Conflicts:
	admin/views/entity/ordertabs/accountdetails.cfm
Updated Version 3.5.013
Merge branch 'master' into feature-ctmerge

Conflicts:
	admin/layouts/default.cfm
	admin/views/entity/accountloyaltytabs/accountloyaltytransactions.cfm
	admin/views/entity/accounttabs/accountloyalties.cfm
	admin/views/entity/accounttabs/accountpaymentmethods.cfm
	admin/views/entity/accounttabs/accountpayments.cfm
	admin/views/entity/accounttabs/cartsandquotes.cfm
	admin/views/entity/accounttabs/contactdetails.cfm
	admin/views/entity/accounttabs/orders.cfm
	admin/views/entity/addresszonetabs/locations.cfm
	admin/views/entity/attributesettabs/attributes.cfm
	admin/views/entity/attributetabs/attributeoptions.cfm
	admin/views/entity/countrytabs/states.cfm
	admin/views/entity/createaccountpayment.cfm
	admin/views/entity/createorderpayment.cfm
	admin/views/entity/detailaccount.cfm
	admin/views/entity/detailaccountloyalty.cfm
	admin/views/entity/detailaccountpayment.cfm
	admin/views/entity/detailaccountpaymentmethod.cfm
	admin/views/entity/detailaddresszone.cfm
	admin/views/entity/detailattribute.cfm
	admin/views/entity/detailattributeoption.cfm
	admin/views/entity/detailattributeset.cfm
	admin/views/entity/detailbrand.cfm
	admin/views/entity/detailcomment.cfm
	admin/views/entity/detailcontent.cfm
	admin/views/entity/detailcountry.cfm
	admin/views/entity/detailemailtemplate.cfm
	admin/views/entity/detaileventtrigger.cfm
	admin/views/entity/detailfile.cfm
	admin/views/entity/detailfulfillmentmethod.cfm
	admin/views/entity/detailimage.cfm
	admin/views/entity/detailintegration.cfm
	admin/views/entity/detaillocation.cfm
	admin/views/entity/detailloyalty.cfm
	admin/views/entity/detailloyaltyaccruement.cfm
	admin/views/entity/detailloyaltyredemption.cfm
	admin/views/entity/detailloyaltyterm.cfm
	admin/views/entity/detailoption.cfm
	admin/views/entity/detailoptiongroup.cfm
	admin/views/entity/detailorder.cfm
	admin/views/entity/detailorderfulfillment.cfm
	admin/views/entity/detailorderitem.cfm
	admin/views/entity/detailorderpayment.cfm
	admin/views/entity/detailpaymentmethod.cfm
	admin/views/entity/detailpermissiongroup.cfm
	admin/views/entity/detailphysical.cfm
	admin/views/entity/detailpricegroup.cfm
	admin/views/entity/detailpricegrouprate.cfm
	admin/views/entity/detailprinttemplate.cfm
	admin/views/entity/detailproduct.cfm
	admin/views/entity/detailproducttype.cfm
	admin/views/entity/detailpromotion.cfm
	admin/views/entity/detailpromotionperiod.cfm
	admin/views/entity/detailpromotionqualifier.cfm
	admin/views/entity/detailpromotionreward.cfm
	admin/views/entity/detailschedule.cfm
	admin/views/entity/detailshippingmethod.cfm
	admin/views/entity/detailshippingmethodrate.cfm
	admin/views/entity/detailsite.cfm
	admin/views/entity/detailsku.cfm
	admin/views/entity/detailstockadjustment.cfm
	admin/views/entity/detailstockreceiver.cfm
	admin/views/entity/detailsubscriptionbenefit.cfm
	admin/views/entity/detailsubscriptionterm.cfm
	admin/views/entity/detailsubscriptionusage.cfm
	admin/views/entity/detailtask.cfm
	admin/views/entity/detailtaxcategory.cfm
	admin/views/entity/detailtype.cfm
	admin/views/entity/detailvendor.cfm
	admin/views/entity/detailvendororder.cfm
	admin/views/entity/fulfillmentmethodtabs/shippingmethods.cfm
	admin/views/entity/listaccount.cfm
	admin/views/entity/listaddresszone.cfm
	admin/views/entity/listattributeset.cfm
	admin/views/entity/listaudit.cfm
	admin/views/entity/listbrand.cfm
	admin/views/entity/listcategory.cfm
	admin/views/entity/listcontent.cfm
	admin/views/entity/listcountry.cfm
	admin/views/entity/listcurrency.cfm
	admin/views/entity/listemailtemplate.cfm
	admin/views/entity/listeventtrigger.cfm
	admin/views/entity/listfulfillmentmethod.cfm
	admin/views/entity/listintegration.cfm
	admin/views/entity/listlocation.cfm
	admin/views/entity/listloyalty.cfm
	admin/views/entity/listloyaltyterm.cfm
	admin/views/entity/listmeasurementunit.cfm
	admin/views/entity/listoptiongroup.cfm
	admin/views/entity/listorder.cfm
	admin/views/entity/listorderdelivery.cfm
	admin/views/entity/listorderfulfillment.cfm
	admin/views/entity/listorderitem.cfm
	admin/views/entity/listorderorigin.cfm
	admin/views/entity/listorderpayment.cfm
	admin/views/entity/listpaymentmethod.cfm
	admin/views/entity/listpaymentterm.cfm
	admin/views/entity/listpermissiongroup.cfm
	admin/views/entity/listphysical.cfm
	admin/views/entity/listpricegroup.cfm
	admin/views/entity/listprinttemplate.cfm
	admin/views/entity/listproduct.cfm
	admin/views/entity/listproductreview.cfm
	admin/views/entity/listproducttype.cfm
	admin/views/entity/listpromotion.cfm
	admin/views/entity/listroundingrule.cfm
	admin/views/entity/listschedule.cfm
	admin/views/entity/listsession.cfm
	admin/views/entity/listsetting.cfm
	admin/views/entity/listsite.cfm
	admin/views/entity/listsku.cfm
	admin/views/entity/liststate.cfm
	admin/views/entity/liststockadjustment.cfm
	admin/views/entity/liststockreceiver.cfm
	admin/views/entity/listsubscriptionbenefit.cfm
	admin/views/entity/listsubscriptionterm.cfm
	admin/views/entity/listsubscriptionusage.cfm
	admin/views/entity/listtask.cfm
	admin/views/entity/listtaskhistory.cfm
	admin/views/entity/listtaxcategory.cfm
	admin/views/entity/listterm.cfm
	admin/views/entity/listtype.cfm
	admin/views/entity/listvendor.cfm
	admin/views/entity/listvendororder.cfm
	admin/views/entity/listvendororderitem.cfm
	admin/views/entity/loyaltytabs/loyaltyaccruement.cfm
	admin/views/entity/loyaltytabs/loyaltyredemption.cfm
	admin/views/entity/ordertabs/accountdetails.cfm
	admin/views/entity/ordertabs/addsku.cfm
	admin/views/entity/ordertabs/orderpayments.cfm
	admin/views/entity/ordertabs/promotions.cfm
	admin/views/entity/physicalcounttabs/physicalcountitems.cfm
	admin/views/entity/physicaltabs/physicalcounts.cfm
	admin/views/entity/physicaltabs/stockadjustments.cfm
	admin/views/entity/preprocessaccount_addaccountpayment.cfm
	admin/views/entity/preprocessaudit_rollback.cfm
	admin/views/entity/preprocessemail_addtoqueue.cfm
	admin/views/entity/preprocessorder_addorderitem.cfm
	admin/views/entity/preprocessorder_create.cfm
	admin/views/entity/pricegrouptabs/pricegrouprates.cfm
	admin/views/entity/producttabs/defaultimages.cfm
	admin/views/entity/producttabs/skus.cfm
	admin/views/entity/producttabs/skusettings.cfm
	admin/views/entity/producttypetabs/skusettings.cfm
	admin/views/entity/promotionperiodtabs/promotionqualifiers.cfm
	admin/views/entity/promotionperiodtabs/promotionrewards.cfm
	admin/views/entity/promotiontabs/promotioncodes.cfm
	admin/views/entity/promotiontabs/promotionperiods.cfm
	admin/views/entity/settings.cfm
	admin/views/entity/settingstabs/sku.cfm
	admin/views/entity/skutabs/alternateskucodes.cfm
	admin/views/entity/skutabs/currencies.cfm
	admin/views/entity/skutabs/skusettings.cfm
	admin/views/entity/stockadjustmenttabs/stockadjustmentitems.cfm
	admin/views/entity/tasktabs/taskschedules.cfm
	admin/views/entity/vendortabs/vendoraddresses.cfm
	admin/views/main/ckfinder.cfm
	admin/views/main/default.cfm
	admin/views/main/encryptionupdatepassword.cfm
	admin/views/main/login.cfm
	admin/views/main/update.cfm
	admin/views/report/default.cfm
	org/Hibachi/HibachiTags/HibachiEntityActionBar.cfm
	org/Hibachi/HibachiTags/HibachiEntityProcessForm.cfm
	org/Hibachi/HibachiTags/HibachiFieldDisplay.cfm
	org/Hibachi/HibachiTags/HibachiListingDisplay.cfm
	org/Hibachi/HibachiTags/HibachiPermissionGroupEntityPermissions.cfm
	org/Hibachi/HibachiTags/HibachiReportConfigureBar.cfm
	org/Hibachi/HibachiTags/HibachiTabGroup.cfm
	org/Hibachi/HibachiTags/HibachiTimeline.cfm
	tags/SlatwallAdminCommentsDisplay.cfm
	tags/SlatwallAdminFilesDisplay.cfm
	tags/SlatwallAdminImagesDisplay.cfm
	tags/SlatwallFormField.cfm
	tags/SlatwallProcessOptionBar.cfm
	tags/SlatwallSettingTable.cfm
	version.txt
Updated Version 3.5.013.016
Merge branch 'feature' of https://github.com/ten24/Slatwall into
feature-4-dynamicjs

Conflicts:
	admin/views/entity/workflowtabs/tasks.cfm