Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

# Conflicts:
#	src/main/java/fr/xephi/authme/datasource/MySQL.java

src/main/java/fr/xephi/authme/settings/SettingsWarner.java

@@ -56,9 +56,9 @@ public class SettingsWarner {
         // Warn if spigot.yml has settings.bungeecord set to true but config.yml has Hooks.bungeecord set to false
         if (Utils.isSpigot() && Bukkit.spigot().getConfig().getBoolean("settings.bungeecord")
             && !settings.getProperty(HooksSettings.BUNGEECORD)) {
-            ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in" +
-                " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the AuthMeBungee" +
-                " add-on to work properly you have to enable this option!");
+            ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in"
+                + " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the"
+                + " AuthMeBungee add-on to work properly you have to enable this option!");
         }
 
         // Check if argon2 library is present and can be loaded

src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java

@@ -22,7 +22,7 @@ public final class ProtectionSettings implements SettingsHolder {
 
     @Comment({
         "Countries allowed to join the server and register. For country codes, see",
-        "http://dev.maxmind.com/geoip/legacy/codes/iso3166/",
+        "https://dev.maxmind.com/geoip/legacy/codes/iso3166/",
         "PLEASE USE QUOTES!"})
     public static final Property<List<String>> COUNTRIES_WHITELIST =
         newListProperty("Protection.countries", "US", "GB");