城市切换
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/wb/sc/config/NetConfig.java
个人中心
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/wb/sc/activity/base/BaseItemPhotoFragment.java