Added combo box
Merge branch 'master' of github.com:Erotemic/ibeis
Finished adding combo box
Merge branch 'master' of github.com:Erotemic/ibeis