Fixed UpVoteTest
Merge branch 'master' of https://github.com/CMPUT301F14T07/Team7-301Project

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