Commit from home
Merge branch 'master' of https://github.com/zhengmingc/zmcRepo

Conflicts:
	WCCon/WCCon.v11.suo