Merge branch 'version2.2' into SidneyFan
Integration
Merge branch 'MaggieHe' into version2.3

Conflicts:
	src/wm/view/StartWordDefineView.java
Merge branch 'version2.3' into MaggieHe