Merge pull request #89 from shelling/master

Bridge Company info and Category info
Reject categories not in tisa mapping