Merge branch 'ly_develop' into develop

 var yohogirlsFrontendWeb;
 var yohogirlsFrontendWeb;
-
+require('./js/public');
+require('./js/home');
 require('./js/channel');
 require('./js/channel');
-module.exports = yohogirlsFrontendWeb;
+module.exports = yohogirlsFrontendWeb;

@@ -4,7 +4,9 @@
  * @date：2013-05-7
  * @date：2013-05-7
  */
  */
 window.tmp$ = null;
 window.tmp$ = null;
-var $ = require('jquery');
+var $ = require('jquery'),
+    Swiper = require("yoho-idangerous.swiper");
+require("lazyload");
 $(".lazy").lazyload();
 $(".lazy").lazyload();
 $.fn.top = function() {
 $.fn.top = function() {
     if (arguments.length > 0) {
     if (arguments.length > 0) {
@@ -24,8 +26,8 @@ $.fn.left = function() {
     }
     }
 };
 };
 
 
-require("lazyload");
-var Swiper = require("yoho-idangerous.swiper");
+
+
 $(".lazy").lazyload();
 $(".lazy").lazyload();
 
 
 //扩展jquery=================================================================
 //扩展jquery=================================================================

@@ -26,7 +26,7 @@
       "yoho-tips": "0.0.1",
       "yoho-tips": "0.0.1",
       "mustache": "2.0.0",
       "mustache": "2.0.0",
       "jquery.autocomplete": "~0.0.2",
       "jquery.autocomplete": "~0.0.2",
-      "mlellipsis": "0.0.2",
+      "mlellipsis": "0.0.3",
       "jquery.rotate2d": "0.0.3"
       "jquery.rotate2d": "0.0.3"
     },
     },
     "devDependencies": {
     "devDependencies": {