Merge origin/master

Conflicts:
	src/robot/UI/StallPanelUI.java