1
Merge remote-tracking branch 'origin/master'

Conflicts:
	CreditManage/src/main/resources/springconf/applicationContext.xml