* Removed Packages and ProjectSettings folders, so it works properly as a submodule

Assets/SO Architecture/Collections/BaseCollection.cs

@@ -3,7 +3,7 @@
 
 namespace ScriptableObjectArchitecture
 {
-    public abstract class BaseCollection : SOArchitectureBaseObject, IEnumerable
+    public abstract class BaseCollection : GameEventBase, IEnumerable
     {
         public object this[int index]
         {
@@ -30,5 +30,5 @@ public bool Contains(object obj)
         {
             return List.Contains(obj);
         }
-	}
+    }
 }

Assets/SO Architecture/Collections/Collection.cs

@@ -40,15 +40,28 @@ public override Type Type
         public void Add(T obj)
         {
             _list.Add(obj);
+            Raise();
         }
+
+        public void AddRange(IList<T> obj)
+        {
+            _list.AddRange(obj);
+            Raise();
+        }
+
         public void Remove(T obj)
         {
             if (_list.Contains(obj))
+            {
                 _list.Remove(obj);
+                Raise();
+            }
+
         }
         public void Clear()
         {
             _list.Clear();
+            Raise();
         }
         public bool Contains(T value)
         {
@@ -61,10 +74,12 @@ public int IndexOf(T value)
         public void RemoveAt(int index)
         {
             _list.RemoveAt(index);
+            Raise();
         }
         public void Insert(int index, T value)
         {
             _list.Insert(index, value);
+            Raise();
         }
         IEnumerator IEnumerable.GetEnumerator()
         {
@@ -78,8 +93,9 @@ public override string ToString()
         {
             return "Collection<" + typeof(T) + ">(" + Count + ")";
         }
-        public T[] ToArray() {
+        public T[] ToArray()
+        {
             return _list.ToArray();
         }
-    } 
-}
+    }
+}

Assets/SO Architecture/Editor/Code Generation/Templates/GameEventListenerTemplate

@@ -3,7 +3,7 @@ using ScriptableObjectArchitecture;
 
 namespace $NAMESPACE$
 {
-	[AddComponentMenu(SOArchitecture_Utility.EVENT_LISTENER_SUBMENU + "$TYPE$")]
+	[AddComponentMenu(SOArchitecture_Utility.EVENT_LISTENER_SUBMENU + "$TYPE$" + " Event Listener")]
 	public sealed class $TYPE_NAME$GameEventListener : BaseGameEventListener<$TYPE$, $TYPE_NAME$GameEvent, $TYPE_NAME$UnityEvent>
 	{
 	}

Assets/SO Architecture/Editor/Generic Property Drawer/PropertyIterator.cs

@@ -19,7 +19,7 @@ public PropertyIterator(SerializedProperty property)
         protected readonly SerializedProperty iterator;
         protected readonly SerializedProperty endProperty;
 
-        private bool consumeChildren;
+        //private bool consumeChildren;
         private int parentDepth;
 
         public virtual bool Next()
@@ -54,7 +54,7 @@ private void UpdateState(SerializedProperty property)
             if (IsSingleLine(iterator))
             {
                 parentDepth = iterator.depth;
-                consumeChildren = true;
+                //consumeChildren = true;
             }
         }
         private bool CanDraw()

Assets/SO Architecture/Variables/SceneVariable.cs

@@ -110,15 +110,21 @@ public void OnBeforeSerialize()
                 var sceneAssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(sceneAssetPath);
                 var scenes = UnityEditor.EditorBuildSettings.scenes;
 
+                //Fix SceneIndex != index in build settings, can cause exceptions when using LoadScene(int) #156
                 SceneIndex = -1;
+                int enabledSceneIndex = 0; //scenes are only given a build index if enabled.
                 for (var i = 0; i < scenes.Length; i++)
                 {
+                    bool sceneIsEnabled = scenes[i].enabled;
                     if (scenes[i].guid.ToString() == sceneAssetGUID)
                     {
-                        SceneIndex = i;
-                        IsSceneEnabled = scenes[i].enabled;
+                        if (sceneIsEnabled)
+                            SceneIndex = enabledSceneIndex++;
+                        IsSceneEnabled = sceneIsEnabled;
                         break;
                     }
+                    else if (sceneIsEnabled)
+                        ++enabledSceneIndex;
                 }
             }
             #endif