Merge pull request #9 from jmcriffey/master

ComboBox input bug fix
fix calendar button issue