Merge origin/master

Conflicts:
	ChangeLog.rtf
	src/robot/CowManager.java
	src/robot/StallManager.java
	src/robot/UI/StallPanelUI.java
	src/version.properties