Add CMD module
fix conflicts in softsan-cli
Merge branch 'master' of https://github.com/lihuiba/SoftSAN

Conflicts:
	softsan-cli
Add CMD module