Merge branch 'fan_test' into ArielQian
Revert 3d10ef0..dcad9ca

This rolls back to commit 3d10ef0c6c205536b9e52db1da98a86e598296fc.
Model Finished

Today I finished the model part, including DictionaryImpl and all the
test.
The Dictionaries finished yesterday have some bugs and I have fixed
them.
The next thing todo: maybe need to implement the RecordImpl.
Merge remote-tracking branch 'origin/version2.1' into ArielQian

Conflicts:
	src/wm/RootDelegate.java
	src/wm/controller/HomeController.java
	src/wm/controller/ReciteMainController.java
	src/wm/controller/ReciteProcessController.java
Change a lot

merge the other’s code and fix the bugs.
Merge branch 'ArielQian' into version2.1