PMT toString
Stream type to string
change to use a tree for program selection
Merge branch 'origin/master'

Conflicts:
	src/UI/LushSpliceUI.form
	src/UI/LushSpliceUI.java
	src/lushsplicev2/LushSpliceV2.java
Merge commit '6390629a3bed3d0399e5241207c5ebe4f25f109d' into gui_changes

Conflicts:
	src/UI/LushSpliceUI.java
Merge commit 'a9da5727a4a061aa7f791b7994c4a5231bdbd6cd' into gui_changes

Conflicts:
	src/UI/LushSpliceUI.java
Merge commit '9b6a54023039c9b4983ab3718e7f47f1f9f9dcff' into gui_changes

Conflicts:
	src/UI/LushSpliceUI.form
	src/UI/LushSpliceUI.java
Conflicts fixed in merge
Merge commit 'ec5896489081950dda230d144bc2e62d8b765978' into gui_changes
Fix some stuff broken in merge
Tabbed form
remove tracked file from 'private' folder
Merge commit '5630d73c4cb4f372ab1fc248007957757312d0a0' into gui_changes

Conflicts:
	src/UI/LushSpliceUI.form
	src/UI/LushSpliceUI.java
Merge branch 'origin/master'

Conflicts:
	src/UI/LushSpliceUI.java
Merge branch 'origin/gui_changes_pt2'