tempchange
Revert "tempchange"

This reverts commit 6356226cd6b3aa69397078c093046b0de36d3399.
mn
jkbkj
Revert "mn"

This reverts commit 0f8e2305fee0a2ea6871e3ba8c40699ddb3b2c4e.

Conflicts:
	BattleGrounds/BattleGrounds-csharp.sln
	BattleGrounds/BattleGrounds.sln
	BattleGrounds/Library/shadercompiler-1.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	BattleGrounds/Assets/2dScene.unity
	BattleGrounds/BattleGrounds-csharp.sln
	BattleGrounds/BattleGrounds.sln
	BattleGrounds/BattleGrounds.userprefs
	BattleGrounds/Library/CurrentMaximizeLayout.dwlt
	BattleGrounds/Library/InspectorExpandedItems.asset
	BattleGrounds/Library/shadercompiler-1.log