Trying to pick up billers changes but I'm not sure if this works how it shoulld.
Merge branch 'master' of https://github.com/pherg/Turreted

Conflicts:
	Unity/Turreted/Assembly-CSharp-vs.csproj
	Unity/Turreted/Assembly-CSharp.csproj
	Unity/Turreted/Assembly-CSharp.pidb
	Unity/Turreted/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Turreted/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Turreted/Library/assetDatabase3
	Unity/Turreted/Library/guidmapper
	Unity/Turreted/Library/metadata/1c/1cec496092af34c59b8d3281f32c7772
	Unity/Turreted/Turreted-csharp.sln
	Unity/Turreted/Turreted.sln
	Unity/Turreted/Turreted.userprefs
a