UI优化
Merge branch 'dev' of https://github.com/Java3-2/Card-English into dev

Conflicts:
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$id.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$layout.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$menu.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$string.class
	CardEnglish/bin/classes/com/java3_2/cardengilsh/R$style.class
	CardEnglish/gen/com/java3_2/cardengilsh/R.java