Merge remote-tracking branch 'origin/xjy-parser'

Conflicts:
	test/application/TestParser.java
Merge branch 'sun-v0.4' of github.com:cs2103aug2014-w14-2j/main into sun-v0.4

Conflicts:
	test/application/TestParser.java