Tweaked LicenseType model and added UNK license types
Merge branch 'my'