Improved parser accordingly and fixed the parser test.
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main