TM fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MainForm.java
	src/MainForm.jfd