Merge branch 'master' of https://github.com/liivur/Ryhm1

Conflicts:
	trunk/app.log
	trunk/src/ee/ut/math/tvt/salessystem/ui/panels/PurchaseItemPanel.java