Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/Autobio_UI

Conflicts:
	CallCenterWeb.UI/callScreen/call.js