Merge origin/master

Conflicts:
	src/micetest/Mice.java