回家commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/TTWORDS.DB
	res/layout/view_study_viewpager.xml
	src/com/zhu/ttwords/bean/UserBean.java