Worked on the date and time picker
Merge remote-tracking branch 'origin/protoBranch' into protoBranch

Conflicts:
	js/controllers/taskTableController.js
Merge branch 'protoBranch' of https://github.com/christianokeeffe/sw703e14 into protoBranch

Conflicts:
	js/controllers/taskTableController.js