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

沈斌

2018-02-28 e86e4f95fcca349107237f8f4161b9c91e279af1

 karma.conf.js

@@ -28,6 +28,7 @@
    logLevel: config.LOG_INFO,
    autoWatch: true,
    browsers: ['Chrome'],
    singleRun: false
    singleRun: false,
    browserNoActivityTimeout: 60000 
  });
};