提交定位城市代码
提交定位城市代码
在省中过滤掉"市"字符
Merge origin/master

Conflicts:
	client/src/net/ipetty/ibang/android/city/ProvinceActivity.java