Ahn
Merge branch 'master' of https://github.com/HeoSeokMu/BBuSic

Conflicts:
	BBuSic/build/classes/payment/action/cashInsertAction.class
	BBuSic/build/classes/payment/action/payBuyListAction.class
	BBuSic/build/classes/struts.xml