[*] Merged fresh master and resolved conflicts.

diff --cc code/Exporter.cpp
Simple merge

diff --cc code/X3DImporter.cpp
index 49a26ed,dd53bd3..024eedb
--- 1/code/X3DImporter.cpp
--- 2/code/X3DImporter.cpp
+++ b/code/X3DImporter.cpp
@@@ -1303,14 -1418,22 +1418,20 @@@ void X3DImporter::ParseFile(const std::
  
  void X3DImporter::ParseNode_Root()
  {
 -    LogInfo("ParseNode_Root b");
        // search for root tag <X3D>
-       if(!XML_SearchNode("X3D")) throw DeadlyImportError("Root node \"X3D\" not found.");
+     if ( !XML_SearchNode( "X3D" ) )
+     {
+         throw DeadlyImportError( "Root node \"X3D\" not found." );
+     }
  
        ParseHelper_Group_Begin();// create root node element.
        // parse other contents
 -    LogInfo("ParseNode_Root. read loop");
        while(mReader->read())
        {
-               if(mReader->getNodeType() != irr::io::EXN_ELEMENT) continue;
+         if ( mReader->getNodeType() != irr::io::EXN_ELEMENT )
+         {
+             continue;
+         }
  
                if(XML_CheckNode_NameEqual("head"))
                        ParseNode_Head();

diff --cc code/X3DImporter.hpp
Simple merge

diff --cc code/X3DImporter_Postprocess.cpp
Simple merge

diff --cc code/X3DImporter_Rendering.cpp
Simple merge