Make code beautify
Merge branch 'SidneyFan' into version3.0
Make code beautiful

Little change
Merge branch 'version3.0' into MaggieHe

Conflicts:
	src/wm/model/Dictionary.java
	src/wm/model/Records.java