Replaced ID with name in org-tag in usertoken.ftl
Commented out getCompanyNumber. Needs update for companyName.
Merge remote-tracking branch 'origin/master'