add some method
add
Merge branch 'maixezer'

Conflicts:
	MPOS/POS-Z/src/com/pos/inventory/Inventory.java
Merge branch 'master' of https://github.com/maixezer/POS-Z.git