Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git

into dev

build_cfg/ekexiu_build.json

@@ -0,0 +1,8 @@
{
  "handleFiles": [],
  "ignoreFiles": [
    "/build_cfg/**/*",
    "/**/.git/**/*",
    "/**/.gitignore"
  ]
}

build_cfg/ekexiu_build_dev.json

@@ -0,0 +1,3 @@
{
	"version": "dev-20170518"
}