* master:
  ka-manager-ui  .babelrc

Conflicts:
	build/webpack.base.conf.js
	dist/index.html
	dist/static/js/0.cbaf0f4.js
	dist/static/js/5.5b14b07.js
	dist/static/js/manifest.6034e5c.js
	dist/static/js/manifest.6034e5c.js.map
	package.json