timepicker changes now able to be added
Merge origin/master
timepicker changes now able to be added