Merge remote-tracking branch 'origin/xjy-parser' into sun-defcoding
temporary integration with singleton parser
Task list backup implemented
Merge branch 'master' of https://github.com/cs2103aug2014-w14-2j/main into hyungjon-data

Conflicts:
	src/application/Controller.java
Merge remote-tracking branch 'origin/hyungjon-data' into sun-defcoding
Resolved branch conflict in Controller
Merge remote-tracking branch 'origin/hyungjon-data' into sun-defcoding

Conflicts:
	src/application/Controller.java
Merge branch 'xjy-parser' of https://github.com/cs2103aug2014-w14-2j/main into hyungjon-data

Conflicts:
	src/application/Controller.java
Autocomplete can now complete the command for the user when the user selects the item from the listview and entered the delete button
enabled undo function, for Controller, DataStorage and TaskManager
clearing the textbox after a command is successfully entered
clearing the textbox after the command is entered
Merge branch 'master' into tys-ui
Merge branch 'sun-controller' into xjy-parser
Merge branch 'hyungjon-data' into xjy-parser

Conflicts:
	src/application/Controller.java