Merge branch 'pojo_package_scan'
Merge remote-tracking branch 'upstream/master'
Fix Ui bug when too many allowed values
Merge pull request #30 from tony75/fixUiTooManyAllowedValues

Fix ui too many allowed values