Added timepicker
Merge remote-tracking branch 'origin/seconditer' into seconditer
Merge remote-tracking branch 'origin/seconditer' into seconditer
committing changes to myguy