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

Conflicts:
	MadmucFarm/bin/iPhoneSimulator/Debug/MadmucFarm.app/MadmucFarm
	MadmucFarm/obj/iPhoneSimulator/Debug/monotouch_dll_content_processed

MadmucFarm/obj/iPhoneSimulator/Debug/mtouch-cache/main.i386.cache.0fStzw
Jri0tQdrfowJqdxk9jveY=.o