lauriviin
Merge branch 'master' of https://github.com/pohh-mell/BeerHousePOS

Conflicts:
	test/data/StockItemTest.java