Requested safetypush from Justin
Committing to fix merge errors.
Merge branch 'master' of https://github.com/andallas/Wopen

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj