Syntax changes
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	bin/mytasks/file/Task.class
	bin/mytasks/logic/LocalMemory.class
	bin/mytasks/logic/MyTasksLogic.class
	bin/mytasks/ui/MyTasksUI.class
Added quickfixes in time for demo. Refer to comments for problems