Merge pull request #443 from Glitchfinder/master

Merge conflicts are fun.

src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java

@@ -18,7 +18,6 @@ public class AcrobaticsManager {
         this.player = player;
         this.profile = Users.getProfile(player);
         this.skillLevel = profile.getSkillLevel(SkillType.ACROBATICS);
-        this.permissionInstance = Permissions.getInstance();
     }
 
     /**