Merge origin/master

Conflicts:
	src/mice_project/MainWindow.java