ecomfe/edp#143
Merge branch 'master' of github.com:ecomfe/edp
Remove edp-doctor dependency
Make the test case pass
bump to 0.7.0
Merge branch 'master' into 1.0.0-dev

Conflicts:
	.travis.yml
	lib/doctor.js
	package.json
Fix lib/cli.js exception issue