完成用户更换头像功能
Merge branch 'master' of https://git@github.com/zhuzhiqing/busy.git

Conflicts:
	AndroidManifest.xml