Merge origin/master

Conflicts:
	src/interfaces/Window.java
Merge origin/master

Conflicts:
	src/interfaces/Window.java