添加专属小词库功能~
Merge branch 'dev' into oodev

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/example/wordsrecite/SecondActivity.java
	src/com/example/wordsrecite/ThirdActivity.java