Merge branch 'version2.1' into SidneyFan
Merge branch 'version2.1' into SidneyFan
Merge branch 'version2.1' into MaggieHe
RecordView Finished
Merge branch 'ArielQian' into version2.2
Merge remote-tracking branch 'origin/version2.2' into MaggieHe
ReciteRecord Finished
Before merge
Merge branch 'SidneyFan' into version2.2
Controller Modified

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

Conflicts:
	src/wm/view/StartWordDefineView.java
Merge branch 'version2.2' into SidneyFan
Merge branch 'version2.2' into MaggieHe
Integration
RecordController Modified

modified the init function
Merge branch 'MaggieHe' into version2.3

Conflicts:
	src/wm/view/StartWordDefineView.java
Merge branch 'version2.3' into MaggieHe
Little bug of Bar
little bug of ReciteMainView
Merge branch 'SidneyFan' into version2.3