sync
Merge branch 'master' of https://github.com/Bibo77/MADMUCfarm

Conflicts:
	MadmucFarm.userprefs
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.app/MadmucFarm
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.app/MadmucFarm.exe
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.app/MadmucFarm.exe.mdb
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.exe
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.exe.mdb