Merge remote-tracking branch 'origin/develop' into test

@@ -2,10 +2,11 @@ var yohobuy;
 
 require('./js/common');
 
-require('./js/passport/index');
-require('./js/guang/index');
-require('./js/home/index');
-require('./js/product/index');
-require('./js/index/index');
+require('./js/category/entry');
+require('./js/guang/entry');
+require('./js/home/entry');
+require('./js/index/entry');
+require('./js/passport/entry');
+require('./js/product/entry');
 
 module.exports = yohobuy;

+/**
+ * 品类打包入口
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/10/28
+ */
+
+require('./index');
+require('./brand');
\ No newline at end of file