121810
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	gen/com/wise/wawc/R.java
	src/com/wise/wawc/AccountActivity.java
honesty_121815，定位等修改
honesty_121911,完善到我的订单
honesty_121917,城市选择
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	.classpath
	AndroidManifest.xml