update
Merge remote-tracking branch 'origin/master'

Conflicts:
	biz/src/java/com/jiakun/xplatform/sap/service/impl/SSOServiceImpl.java