SubTokenBasic merge with Entity subtokens
SubTokenBasic merge with Entity subtokens

AlejandroCano/framework,avifatal/framework,AlejandroCano/framework,signumsoftware/framework,signumsoftware/framework,avifatal/framework