Changing speed to strafeSpeed
Merge Conflict Fixes

Conflicts:
	DroneWars/Assets/Prefabs/nameDisplay.prefab
	DroneWars/Assets/Scripts/PlayerManager.cs
	DroneWars/DroneWars.userprefs
	DroneWars/Library/CurrentLayout.dwlt
	DroneWars/Library/ScriptAssemblies/Assembly-CSharp.dll
	DroneWars/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DroneWars/Library/assetDatabase3
	DroneWars/Library/metadata/91/910043dedc01f314f91763e7d9eb5810