Merge branch 'develop' into solarsystem2

Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp

src/rendering/renderablesphericalgrid.cpp

@@ -138,13 +138,28 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
 
 RenderableSphericalGrid::~RenderableSphericalGrid(){
 	deinitialize();
+
+	// Delete not done in deinitialize because new is done in constructor
+	delete[] _varray;
+	delete[] _iarray;
 }
 
 bool RenderableSphericalGrid::isReady() const {
-	return _gridProgram != nullptr;
+	bool ready = true;
+	ready &= (_gridProgram != nullptr);
+	return ready;
 }
 
 bool RenderableSphericalGrid::deinitialize(){
+	glDeleteVertexArrays(1,&_vaoID);
+	_vaoID = 0;
+
+	glDeleteBuffers(1,&_vBufferID);
+	_vBufferID = 0;
+
+	glDeleteBuffers(1,&_iBufferID);
+	_iBufferID = 0;
+
 	return true;
 }
 
@@ -182,7 +197,6 @@ bool RenderableSphericalGrid::initialize(){
 }
 
 void RenderableSphericalGrid::render(const RenderData& data){
-	assert(_gridProgram);
 	_gridProgram->activate();
 
 	glm::mat4 transform;
@@ -211,8 +225,8 @@ void RenderableSphericalGrid::render(const RenderData& data){
 	glBindVertexArray(0);
 
 	_gridProgram->deactivate();
-	
 }
+
 void RenderableSphericalGrid::update(const UpdateData& data){
 
 	openspace::SpiceManager::ref().getPositionTransformMatrix("IAU_JUPITER", "GALACTIC", data.time, _parentMatrix);