minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/swing/testing/mainFrame.class