Merge branch 'master' of https://github.com/zzxwill/FinancialService.git

Conflicts:
	FinancialService/WebContent/common/header.jsp
Merge branch 'master' of https://github.com/zzxwill/FinancialService.git