Uncomment test code
Add support for "now"
Merge branch 'master' of https://github.com/cs2103aug2014-w14-1j/main into wd-parser