[branch2]
Merge branch 'master' into branch2

Conflicts:
	20141020.txt
[WebApiSSO create]
[提交修订]