Merge branch 'develop/1.1.1' into develop/1.2.0

# Conflicts:
#	luamods/wolfadmin/db/db.lua
#	luamods/wolfadmin/main.lua
#	luamods/wolfadmin/util/files.lua
#	luamods/wolfadmin/util/tables.lua
#	luascripts/admin/admin.lua
#	luascripts/commands/admin/listlevels.lua
#	luascripts/commands/admin/showwarns.lua
#	luascripts/db/mysql.lua
#	luascripts/db/sqlite3.lua

luamods/wolfadmin/db/db.lua

@@ -22,22 +22,28 @@ local db = {}
 
 local con
 
+function db.isconnected()
+    return (con ~= nil)
+end
+
 -- as this module serves as a wrapper/super class, we load the selected database
 -- system in this function. might have to think of a better way to implement
 -- this, but it will suffice.
 function db.oninit()
-    if settings.get("db_type") == "mysql" then
+    if settings.get("db_type") ~= "none" then
-        con = require (wolfa_getLuaPath()..".db.mysql")
+        if settings.get("db_type") == "sqlite3" then
-    elseif settings.get("db_type") == "sqlite3" then
             con = require (wolfa_getLuaPath()..".db.sqlite3")
+        elseif settings.get("db_type") == "mysql" then
+            con = require (wolfa_getLuaPath()..".db.mysql")
         else
-        error("invalid database system (choose mysql, sqlite3)")
+            error("invalid database system (none|sqlite3|mysql)")
         end
 
         setmetatable(db, {__index = con})
 
         db.start()
     end
+end
 events.handle("onGameInit", db.oninit)
 
 function db.onshutdown(restartMap)