Merge branch 'f_branch2' of https://github.com/shiv3/projectsiva into f_branch2

Conflicts:
	WEB-INF/classes/foo/GOODSMASTER_PRE_INSERT.class
	WEB-INF/classes/foo/Receipt.class
	WEB-INF/classes/foo/master/CATEGORYMASTER_PRE_INSERT.class
	WEB-INF/classes/foo/master/SHOPMASTER_PRE_INSERT.class
	WEB-INF/classes/foo/master/SUPPLIERMASTER_PRE_INSERT.class
	WEB-INF/src/foo/master/GOODSMASTER_PRE_INSERT.java
	work/org/apache/jsp/jsp/receipt_005fconfirm_jsp.class
	work/org/apache/jsp/jsp/receipt_005frequest_jsp.class