Added time check when creating or editing a TODO (i.e. start <= end)
Merged conflicts in Util and TaskView