Merge remote-tracking branch 'origin/master'

Conflicts:
	F14T07-Application/bin/classes/ca/ualberta/cs/models/AddThread.class
	F14T07-Application/bin/classes/ca/ualberta/cs/models/DataManager.class

	F14T07-Junit-testTest/bin/classes/ca/ualberta/cs/f14t07_application/test/ReadLaterTest.class