a
Merge branch 'master' of ssh://github.com/krzywyzenon/kassasystem

Conflicts:
	Kassasystem/src/net/cirillo/pos/Items.java