Added a timepicker
Merge branch 'master' of github.com:chuck211991/jupiter