Display timed task without from-to
Merge branch 'master' of https://github.com/cs2103aug2014-w10-4j/main
Add some test cases for date parser
Resolve conflict