IS changes
Merge remote branch 'remote/master'

Conflicts:
	src/gui/forms/add/InventorySheetForm.java