Calendar update, settings app, combo box, and textbox+keyboard
Merge branch 'master' of https://github.com/gdelar2/Rosie