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

Conflicts:
	src/com/asd/ccardapplication/gui/CreditMainFrame.java