product form and popup edits
Merge remote branch 'origin/master'

Conflicts:
	src/gui/forms/util/RowPanel.java