dere
Fix probs
Merge origin/master

Conflicts:
	buildnumber.properties
	src/me/StevenLawson/TotalFreedomMod/Commands/Command_robinmanage.java