UI
冲突解决
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev

Conflicts:
	CardEnglish/src/com/Mars/domain/Entity/Word.java