Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl

src/scripting/scriptengine.cpp

@@ -43,10 +43,6 @@
 namespace {
     const char* _loggerCat = "ScriptEngine";
 
-    const char* LuaGlobalNamespace = "_G";
-    const char* PrintFunctionName = "print";
-    //const lua_CFunction _printFunctionReplacement = luascriptfunctions::printInfo;
-
     const int TableOffset = -3; // -1 (top) -1 (first argument) -1 (second argument)
 
     const char* MainTemplateFilename = "${OPENSPACE_DATA}/web/luascripting/main.hbs";
@@ -151,7 +147,7 @@ bool ScriptEngine::hasLibrary(const std::string& name) {
     auto it = std::find_if(
         _registeredLibraries.begin(),
         _registeredLibraries.end(),
-        [name](const LuaLibrary& it) { return it.name == name; }
+        [name](const LuaLibrary& i) { return i.name == name; }
     );
     return (it != _registeredLibraries.end());
 }

src/scripting/scriptengine_lua.inl

@@ -74,7 +74,7 @@ int walkCommon(lua_State* L, Func func) {
     // Copy values into the lua_State
     lua_newtable(L);
 
-    for (int i = 0; i < result.size(); ++i) {
+    for (int i = 0; i < static_cast<int>(result.size()); ++i) {
         lua_pushstring(L, result[i].c_str());
         lua_rawseti(L, -2, i + 1);
     }
@@ -102,6 +102,7 @@ int printInternal(ghoul::logging::LogLevel level, lua_State* L) {
         case LUA_TTHREAD:
             LOGC(level, "print", "Function parameter was of type '" <<
                     luaTypeToString(type) << "'");
+            break;
         case LUA_TNIL:
             break;
         case LUA_TBOOLEAN:

src/scripting/scriptscheduler.cpp

@@ -245,7 +245,7 @@ ScriptScheduler::progressTo(double newTime)
 
 double ScriptScheduler::currentTime() const {
     return _currentTime; 
-};
+}
 
 std::vector<ScriptScheduler::ScheduledScript> ScriptScheduler::allScripts() const {
     std::vector<ScheduledScript> result;
@@ -258,7 +258,7 @@ std::vector<ScriptScheduler::ScheduledScript> ScriptScheduler::allScripts() cons
         result.push_back(std::move(script));
     }
     return result;
-};
+}
 
 LuaLibrary ScriptScheduler::luaLibrary() {    
     return {