Open file
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Game.unity
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper