seperate branch
add logic to activity.java
fix
fix
Merge branch 'maixezer'

Conflicts:
	MPOS/POS-Z/src/com/pos/inventoryUI/AddActivity.java