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