oops
Merge branch 'master' of https://github.com/equalitie/devopsjs

Conflicts:
	package.json
add edgeManage command