modified:   PalmPrintNetBank/src/com/ppnb/struts/action/AccountAction.java
	modified:   PalmPrintNetBank/src/com/ppnb/struts/action/TradeAction.java
Merge branch 'master' of https://github.com/taoprogramer/PPNB

Conflicts:
	PalmPrintNetBank/WebRoot/assets/src/plugin/jpegcam/webcam.js
	PalmPrintNetBank/build/classes/com/ppnb/struts/action/AccountAction.class
	PalmPrintNetBank/build/classes/com/ppnb/struts/action/TradeAction.class
Merge branch 'master' of https://github.com/taoprogramer/PPNB
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ccf2.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/cicsj2ee.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/conftool.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/connector.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ctgadmin.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ctgclient.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ctgsamples.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ctgserver.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/ctgstats.jar
        new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/mask.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/psk.jar
	new file:   PalmPrintNetBank/WebRoot/WEB-INF/lib/screenable.jar
	new file:   PalmPrintNetBank/build/classes/TEST4.class
	new file:   PalmPrintNetBank/build/classes/com/ppnb/util/CTGCon.class
	new file:   PalmPrintNetBank/build/classes/com/ppnb/util/Encode.class
	new file:   PalmPrintNetBank/build/classes/test6.class
	new file:   PalmPrintNetBank/src/TEST4.java
	new file:   PalmPrintNetBank/src/com/ppnb/util/CTGCon.java
	new file:   PalmPrintNetBank/src/com/ppnb/util/Encode.java
	new file:   PalmPrintNetBank/src/test6.java