Merge origin/master

Conflicts:
	src/interfaces/Window.form
	src/interfaces/Window.java
	src/interfaces/WindowAdmin.form
	src/interfaces/WindowAdmin.java