upgraded to timepicker v 1.1.2

Conflicts:
	dateInput.js