updated
Merge branch 'master' of github.com:wucherpfennig/farmer.exe

Conflicts:
	Farmer.Exe.xcodeproj/project.xcworkspace/xcshareddata/Farmer.Exe.xccheckout