Merge branch 'master' into develop

* master:
  take cash <5k

# Conflicts:
#	go/gopath/src/fohow.com/apps/controllers/balance_controller/balance_controller.go

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

@@ -173,7 +173,6 @@ func (self *BalanceController) TakeCash() {
 	if canExtract < amount {
 		self.ReturnError(403, apps.BalanceNotEnough, "", nil)
 	}
-
 	//超过微信余额限制5K，按5K计算
 	if amount > WX_TAKE_CASH_AMOUNT_LIMIT_MAX {
 		amount = WX_TAKE_CASH_AMOUNT_LIMIT_MAX