test
Merge branch 'master' of https://github.com/lemonleavesE/WordMaster

Conflicts:
	src/controller/EventHandler.java
	src/controller/object/LexiconInfo.java
	src/controller/object/LibraryInfo.java
	src/controller/object/ReciteState.java
	src/model/bean/Lexicon.java
	src/model/bean/Word.java
	src/model/configFile/ConfGenerator.java
	src/model/configFile/ConfigFile.java
	src/model/handler/LexiconHandler.java
	src/model/handler/WordHandler.java
	src/viewer/Main.java