download farm and user from web
Merge branch 'master' of https://github.com/Bibo77/MADMUCfarm

Conflicts:
	MadmucFarm/bin/iPhone/Release/MadmucFarm.app/MadmucFarm