Merge remote-tracking branch 'origin/master' into logic

Conflicts:
	src/storage/Storage.java
	src/theUI/Gui.java
	src/theUI/UserInterface.java
	src/tkLibrary/CommandKey.java
	src/tkLibrary/FrequencyType.java
	src/tkLibrary/Task.java
	src/tkLibrary/UserInput.java
	src/tkLogic/Parser.java
	src/tkLogic/ParserTest.java
Merge branch 'logic' of https://github.com/cs2103aug2014-t16-1j/main into logic