other issues fixed.
Merge remote branch 'origin/master'

Conflicts:
	src/gui/forms/add/InventorySheetForm.java
trial period label plus is few changes..hid cash inout