Renamed TBBs, consolidated package/field name constants and fixed issue with embedding link fields
Merge branch 'master' of https://github.com/willprice76/SI4T