Finally dealt with the time-zone issue, Added pickatime/removed timepicker, and adjusted tests.
Fixed merge conflicts.