log in almost done !
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wars Of Baraxa/Library/CurrentLayout.dwlt
	Wars Of Baraxa/Library/InspectorExpandedItems.asset
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-CSharp.dll
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	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/Library/metadata/1f/1f305b2335daeba499eecf86b09670fd
	Wars Of Baraxa/Library/metadata/20/2000d46754dc17c46bc63a919014a870
	Wars Of Baraxa/Wars Of Baraxa.userprefs