Update resources after merge.

ProjectSettings/EditorSettings.asset

@@ -3,12 +3,22 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 3
+  serializedVersion: 7
   m_ExternalVersionControlSupport: Hidden Meta Files
   m_SerializationMode: 2
+  m_LineEndingsForNewScripts: 1
   m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
   m_SpritePackerMode: 2
   m_SpritePackerPaddingPower: 1
+  m_EtcTextureCompressorBehavior: 0
+  m_EtcTextureFastCompressor: 2
+  m_EtcTextureNormalCompressor: 2
+  m_EtcTextureBestCompressor: 5
   m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
   m_ProjectGenerationRootNamespace: 
   m_UserGeneratedProjectSuffix: 
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
+  m_EnableTextureStreamingInPlayMode: 1

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2018.1.0f2
+m_EditorVersion: 2018.2.0x-ImprovedPrefabs

README.md

-> This branch requires **Unity 2018.1**. For older or future versions of Unity please use a matching branch ([master](../..), [5.6](../../tree/5.6), [2017.1](../../tree/2017.1), [2017.2](../../tree/2017.2) for up to 2017.4-LTS).
+> ⚠️ The code in this branch is not fully compatible with any publicly-available Unity editor. It addresses changes in the prefab workflow.
 
 # Components for Runtime NavMesh Building