Merge branch 'develop' into feature/app_dev

go/gopath/src/fohow.com/apps/controllers/pick_address_controller/pick_address_controller.go

@@ -99,13 +99,12 @@ func (self *PickAddressController) UpdatePickAddress() {
 	}
 	contact := self.GetString("contact")
 	tel := self.GetString("tel")
-	pic_address := self.GetString("pic_address")
 	setDefault, _ := self.GetInt64("set_default")
 
 	if len(tel) != 11 {
 		self.ReturnError(404, apps.ParamsError, "", nil)
 	}
-	if pic_address == "" || contact == "" || tel == "" {
+	if contact == "" || tel == "" {
 		self.ReturnError(404, apps.ParamsRequired, "", nil)
 	}
 	item = item.Update(contact, tel, "")