edit

edit price
Merge remote-tracking branch 'origin/master'

Conflicts:
	KSCClubBand/src/java/db/ConnectionUtil.java