update
Merge branch 'master' of github.com:ShujiaHuang/SoapAsmvar

Conflicts:
	demo/Test.sh
update