添加昵称，添加分类！
Merge branch 'lijincheng' of github.com:wanbin/Undercover into lijincheng

Conflicts:
	res/values/strings.xml
Merge branch 'lijincheng' of github.com:wanbin/Undercover into lijincheng