Merge master into '306-command-service'

Conflict:
- HelpCommand.java

src/main/java/fr/xephi/authme/command/executable/HelpCommand.java

@@ -36,7 +36,8 @@ public class HelpCommand implements ExecutableCommand {
             }
         }
 
-        if (arguments.size() == 1) {
+        int mappedCommandLevel = foundCommandResult.getCommandDescription().getLabelCount();
+        if (mappedCommandLevel == 1) {
             commandService.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
         } else {
             commandService.outputHelp(sender, result, HelpProvider.ALL_OPTIONS);

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

@@ -110,7 +110,7 @@ public class HelpProvider {
 
     private static void printAlternatives(CommandDescription command, List<String> correctLabels, List<String> lines) {
         // TODO ljacqu 20151219: Need to show alternatives for base labels too? E.g. /r for /register
-        if (command.getLabels().size() <= 1) {
+        if (command.getLabels().size() <= 1 || correctLabels.size() <= 1) {
             return;
         }