resolve bug in dateparser
Merge remote-tracking branch 'origin/pn-logic-filter'
Merge branch 'master' of https://github.com/cs2103aug2014-w13-4j/main into storage-chuyu
combine search and filter in storage