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 branch 'ArielQian' into version1.0
Merge branch 'version1.0' of https://github.com/FudanSoftwareCCWI/Lab4 into version1.0

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