Merge origin/master

Conflicts:
	src/GUI/Window.java