can edit
fixed conflict
Merge branch 'master' of https://github.com/batmaster/MPOS

Conflicts:
	src/com/bbaf/mpos/inventory/ui/InventoryActivity.java