Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -139,7 +139,7 @@ class Api_model extends CI_Model {
 
  	function popular() {
  		try {
- 			$rs = $this->db->select('id,name')->where('status',1)->get('region')->result();
+ 			$rs = $this->db->select('id,name,region_icon AS image')->where('status',1)->get('region')->result();
  			if(count($rs) > 0) {
  				$res = array('status'=>1,'data'=>$rs);
  			} else {