Finish the MainForm Demo
Merge origin/stevenbush into stevenbush

Conflicts:
	src/gui/MainForm.form
	src/gui/MainForm.java