用户行为操作和界面注册
Merge branch 'master' of https://github.com/xw8852/guoli

Conflicts:
	guoli/res/values/strings.xml