Updated android to work with new database strucutre.
Merge branch 'master' of https://github.com/jolin1337/Restaurang

Conflicts:
	Desktop/src/se/miun/dt142g/inventory/InventoryPanel.java