暂停
暂停
textfix
Merge branch 'hotfix_avatar'

Conflicts:
	src/com/org/icsfoodapp/RestaurantInnerActivity.java
fix_over
fixover
fixover
fixover
fixordername
serchlinkfix
buildchange
fixover
new build