added timepicker code
merged newTimePicker branch