Core edits.
Core Fixes
Core and security edits
Merge remote branch 'remote/master'

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