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