Early weapons
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/Scene1.unity
	ProjectSettings/TagManager.asset