Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ui/MainWindow.form
	src/ui/MainWindow.java