Merge branch 'version2.1' into MaggieHe
Merge remote-tracking branch 'origin/version2.2' into MaggieHe
Controller Modified

Modifies RecordController, ReciteMainController and
ReciteProcessController.
Merge branch 'MaggieHe' into version2.2

Conflicts:
	src/wm/view/StartWordDefineView.java