Merge branch 'dev' into 'master'

whoops

See merge request ajg0702/ajqueue!23

api/src/main/java/us/ajg0702/queue/api/AjQueueAPI.java

@@ -1,9 +1,5 @@
-package us.ajg0702.queue.common;
+package us.ajg0702.queue.api;
 
-import us.ajg0702.queue.api.AliasManager;
-import us.ajg0702.queue.api.EventHandler;
-import us.ajg0702.queue.api.PlatformMethods;
-import us.ajg0702.queue.api.QueueManager;
 import us.ajg0702.queue.api.premium.Logic;
 import us.ajg0702.queue.api.premium.LogicGetter;
 import us.ajg0702.queue.api.util.QueueLogger;
@@ -79,12 +75,6 @@ public abstract class AjQueueAPI {
      */
     public abstract QueueLogger getLogger();
 
-    /**
-     * Gets the repeating task manager
-     * @return The TaskManager
-     */
-    public abstract TaskManager getTaskManager();
-
     /**
      * Gets the event handler.
      *

common/src/main/java/us/ajg0702/queue/common/QueueMain.java

@@ -72,7 +72,6 @@ public class QueueMain extends AjQueueAPI {
     }
 
     private final TaskManager taskManager = new TaskManager(this);
-    @Override
     public TaskManager getTaskManager() {
         return taskManager;
     }