Changes
Merge branch 'master' of github.com:andrewmunro/Vanilla

Conflicts:
	MilkShake/MilkShake/Game/Managers/ChatManager.cs