edp zhixin start
Merge branch '0.0.1-dev' of https://github.com/ecomfe/edpx-zhixin into 0.0.1-dev