Merge origin/master

Conflicts:
	Mice/src/mice/Window.java