create UI inventory and main
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidPOS/src/com/example/androidpos/InventoryActivity.java