Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into limbo

# Conflicts:
#	src/main/java/fr/xephi/authme/command/executable/authme/debug/DebugCommand.java

src/main/java/fr/xephi/authme/service/CommonService.java

@@ -65,16 +65,6 @@ public class CommonService {
         messages.send(sender, key, replacements);
     }
 
-    /**
-     * Retrieves a message.
-     *
-     * @param key the key of the message
-     * @return the message, split by line
-     */
-    public String[] retrieveMessage(MessageKey key) {
-        return messages.retrieve(key);
-    }
-
     /**
      * Retrieves a message in one piece.
      *
@@ -102,6 +92,7 @@ public class CommonService {
      * @param player the player to process
      * @param group the group to add the player to
      */
+    // TODO ljacqu 20170304: Move this out of CommonService
     public void setGroup(Player player, AuthGroupType group) {
         authGroupHandler.setGroup(player, group);
     }

src/main/java/fr/xephi/authme/service/ValidationService.java

@@ -1,6 +1,7 @@
 package fr.xephi.authme.service;
 
 import ch.jalu.configme.properties.Property;
+import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.message.MessageKey;
@@ -115,9 +116,10 @@ public class ValidationService implements Reloadable {
         }
 
         String countryCode = geoIpService.getCountryCode(hostAddress);
-        return validateWhitelistAndBlacklist(countryCode,
-            ProtectionSettings.COUNTRIES_WHITELIST,
-            ProtectionSettings.COUNTRIES_BLACKLIST);
+        boolean isCountryAllowed = validateWhitelistAndBlacklist(countryCode,
+            ProtectionSettings.COUNTRIES_WHITELIST, ProtectionSettings.COUNTRIES_BLACKLIST);
+        ConsoleLogger.debug("Country code `{0}` for `{1}` is allowed: {2}", countryCode, hostAddress, isCountryAllowed);
+        return isCountryAllowed;
     }
 
     /**
@@ -194,6 +196,7 @@ public class ValidationService implements Reloadable {
         public MessageKey getMessageKey() {
             return messageKey;
         }
+
         public String[] getArgs() {
             return args;
         }