fixed the sort to take into account time, and then to sort by secondary qualities if the end date and time are the same (or unspecified)
Merge branch 'master' of https://github.com/cs2103aug2014-t7-2/main