Merge upstream/master

Conflicts:
	src/ui/MainWindow.java
merge fix
merge fix