商品管理界面
Merge branch 'master' of
ssh://git@github.com/minusone13/InvoicingSystem.git

Conflicts:
	.classpath
	Stock.ser
	User.ser
	accountBuild/commodity/2014-12-15.ser
	accountBuild/customerInfo/2014-12-15.ser