Merge branch 'master' of https://github.com/cs2103aug2014-w14-2j/main into hyungjon-datastorage
More collates and comments
Merge branch 'master' of https://github.com/cs2103aug2014-w14-2j/main into hyungjon-datastorage

Conflicts:
	src/application/TooltipManager.java
UI help message
Merge branch 'tys-ui-v0.4' into xjy-parser
Merge branch 'master' into xjy-parser
fix empty config.json bug
search completed tasks bug fixed
Merge remote-tracking branch 'origin/xjy-parser' into tys-ui-v0.4
implemeted HELP command
setting the title of the listview during HELP
Merge branch 'master' into xjy-parser

Conflicts:
	src/Parser/Parser.java
	src/application/InputCommands.java
resolved merge conflicts
JUnit tests passed
Merge branch 'sun-v0.5' of github.com:cs2103aug2014-w14-2j/main into sun-v0.5
lowercase package task
Components extracted to separate packages
Merge remote-tracking branch 'origin/hyungjon-datastorage'

Conflicts:
	src/application/Controller.java
	src/data/DataStorage.java
	test/application/DataTest.java
	test/application/IntegrationSimpleTest.java
Merge remote-tracking branch 'origin/xjy-parser'

Conflicts:
	src/UI/UIAutoComplete.java