do merge develop code to fixes some bugs

@@ -30,18 +30,8 @@ class SearchData
         switch (APPLICATION_ENV) {
             case 'release':
                 return 'http://100.98.132.63/yohosearch/search.json';
-<<<<<<< HEAD
-<<<<<<< HEAD
-            case 'preview':
-            case 'test':
-=======
-            case 'test':
-            case 'preview':
->>>>>>> develop
-=======
             case 'test':
             case 'preview':
->>>>>>> a257e7190ead0f576f3685ff216b31d1c7d6c3c1
             case 'developer':
             default:
                 return 'http://101.200.31.165/yohosearch/search.json';