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
fix empty config.json bug
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
restore invalidexception and rename test packages
refactored code