Merge branch 'version2.2' into MaggieHe
RecordController Modified

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

Conflicts:
	src/wm/view/StartWordDefineView.java