pretty much working, barcode mode calling display messages
Merge branch 'evan' of https://github.com/jacoblwright/hit into nick

Conflicts:
	src/gui/inventory/InventoryController.java
	src/model/ItemManager.java
Yet even more updates.
hopefully this fixes data converter from getting wiped out
prep
Merge branch 'nick' of https://github.com/jacoblwright/hit into andy
prep
Stuff for Evan
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
Commit for Evan
prep
Merge branch 'andy' of https://github.com/jacoblwright/hit into evan
prep