Dec.13 5:23
Merge branch 'WHQMerge' into Fangjie-Hou

Conflicts:
	bin/AssistantPanel.class
	bin/ControllerFrame$1$1.class
	bin/ControllerFrame$1.class
	bin/ControllerFrame.class
	bin/Main.class
	bin/QAPanel.class
	bin/TextButton.class
	bin/WHQPanel.class
	src/QAPanel.java