add3ByAncowei
add4ByAncowei
add5ByAncowei
add5ByAncowei
Merge branch 'master' of https://github.com/app4women/soul.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/cn/edu/stu/cws/soul/EssayActivity.java