Merge branch 'master' of https://github.com/lihuiba/SoftSAN

Conflicts:
	Client.py
Merge branch 'master' of https://github.com/lihuiba/SoftSAN

Conflicts:
	Client.py
using configuration function to configurate parameters
Merge branch 'master' of https://github.com/lihuiba/SoftSAN