Merge branch 'develop' into feature/scenegraphloader

Conflicts:
	src/abuffer/abuffer.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp

src/scene/scenegraphnode.cpp

@@ -291,6 +291,17 @@ void SceneGraphNode::setParent(SceneGraphNode* parent)
     _parent = parent;
 }
 
+bool SceneGraphNode::abandonChild(SceneGraphNode* child) {
+	std::vector < SceneGraphNode* >::iterator it = std::find(_children.begin(), _children.end(), child);
+
+	if (it != _children.end()){
+		_children.erase(it);
+		return true;
+	}
+
+	return false;
+}
+
 const psc& SceneGraphNode::position() const
 {
     return _ephemeris->position();