Merge branch 'feature/render-bins' into feature/rosetta

Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl

include/openspace/util/updatestructures.h

@@ -50,12 +50,14 @@ struct UpdateData {
     bool doPerformanceMeasurement;
 };
 
+
 struct RenderData {
     const Camera& camera;
     // psc position to be removed in favor of the double precision position defined in
     // the translation in transform.
     psc position;
     bool doPerformanceMeasurement;
+    int renderBinMask;
     TransformData modelTransform;
 };