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

# Conflicts:
#	src/main/java/fr/xephi/authme/permission/PlayerPermission.java
#	src/main/java/fr/xephi/authme/service/BukkitService.java

src/main/resources/plugin.yml

@@ -235,6 +235,7 @@ permissions:
       authme.player.email.see: true
       authme.player.login: true
       authme.player.logout: true
+      authme.player.protection.quickcommandsprotection: true
       authme.player.register: true
       authme.player.security.verificationcode: true
       authme.player.seeownaccounts: true
@@ -275,6 +276,9 @@ permissions:
   authme.player.logout:
     description: Command permission to logout.
     default: true
+  authme.player.protection.quickcommandsprotection:
+    description: Permission that enables on join quick commands checks for the player.
+    default: true
   authme.player.register:
     description: Command permission to register.
     default: true