city
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/im/taoatao/o2o/api/ApiConstants.java