Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 293-translate-help-messages

Conflicts:
	src/main/java/fr/xephi/authme/command/help/HelpProvider.java

src/main/resources/config.yml

@@ -405,7 +405,7 @@ Purge:
     daysBeforeRemovePlayer: 60
     # Do we need to remove the player.dat file during purge process?
     removePlayerDat: false
-    # Do we need to remove the Essentials/users/player.yml file during purge process?
+    # Do we need to remove the Essentials/userdata/player.yml file during purge process?
     removeEssentialsFile: false
     # World where are players.dat stores
     defaultWorld: 'world'
@@ -435,6 +435,8 @@ Protection:
     antiBotSensibility: 10
     # Duration in minutes of the antibot automatic system
     antiBotDuration: 10
+    # Delay in seconds before the antibot activation
+    antiBotDelay: 60
 GroupOptions:
     # Registered permission group
     RegisteredPlayerGroup: ''

src/main/resources/plugin.yml

@@ -126,6 +126,9 @@ permissions:
     authme.admin.reload:
         description: Administrator command to reload the plugin configuration.
         default: op
+    authme.admin.antibotmessages:
+        description: Permission to see Antibot messages
+        default: op
     authme.player.*:
         description: Permission to use all player (non-admin) commands.
         children: