Little Change

Change DictionaryImpl
Merge remote-tracking branch 'origin/version2.3' into ArielQian

Conflicts:
	src/wm/model/dao/DictionaryImpl.java
Model.dao Changed

Implement another function in DictionaryImpl and test it
Merge branch 'ArielQian' into version2.3