for merge
Merge branch 'master' of https://github.com/lihongming/Lab

Conflicts:
	src/com/asd/bankapplication/gui/BankMainFrame.java