Merge origin/master
Merge origin/master

Conflicts:
	MICE/src/mice/LoginFrame.java