Merge branch 'icon_devel'
Merge branch 'icon_devel'

Conflicts:
VOID_Core.cs

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -126,10 +126,6 @@
 		protected float _updateTimer = 0f;
 		protected string stringFrequency;
 
-		// Celestial Body Housekeeping
-		protected List<CelestialBody> _allBodies = new List<CelestialBody>();
-		protected bool bodiesLoaded = false;
-
 		// Vessel Type Housekeeping
 		protected List<VesselType> _allVesselTypes = new List<VesselType>();
 		protected bool vesselTypesLoaded = false;
@@ -215,7 +211,7 @@
 		{
 			get
 			{
-				return this._allBodies;
+				return FlightGlobals.Bodies;
 			}
 		}
 
@@ -468,12 +464,6 @@
 			this.GUIStylesLoaded = true;
 		}
 
-		protected void LoadAllBodies()
-		{
-			this._allBodies = FlightGlobals.Bodies;
-			this.bodiesLoaded = true;
-		}
-
 		protected void LoadVesselTypes()
 		{
 			this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
@@ -482,11 +472,6 @@
 
 		protected void LoadBeforeUpdate()
 		{
-			if (!this.bodiesLoaded)
-			{
-				this.LoadAllBodies();
-			}
-
 			if (!this.vesselTypesLoaded)
 			{
 				this.LoadVesselTypes();