Background fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wars Of Baraxa/Assets/Graphics/Materials.meta
	Wars Of Baraxa/Assets/Graphics/Materials/Gear.mat
	Wars Of Baraxa/Assets/Graphics/Materials/Gear.mat.meta
	Wars Of Baraxa/Assets/Loading.unity
	Wars Of Baraxa/Library/CurrentLayout.dwlt
	Wars Of Baraxa/Library/InspectorExpandedItems.asset
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Wars Of Baraxa/Library/assetDatabase3
	Wars Of Baraxa/Library/guidmapper
	Wars Of Baraxa/Wars Of Baraxa.userprefs