Merge remote-tracking branch 'origin/develop' into develop

src/commands/music/SubCommandAddTrack.java

@@ -0,0 +1,25 @@
+package commands.music;
+
+import com.google.api.services.youtube.YouTube;
+
+import core.SubCommand;
+import core.SubCommandFormattable;
+import dataStructures.KittyChannel;
+import dataStructures.KittyGuild;
+import dataStructures.KittyRating;
+import dataStructures.KittyRole;
+import dataStructures.KittyUser;
+import dataStructures.UserInput;
+
+public class SubCommandAddTrack extends SubCommand 
+{
+	
+	public SubCommandAddTrack(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
+	{
+		
+		return null;
+	}
+}

src/core/ObjectBuilderFactory.java

@@ -55,7 +55,7 @@ public class ObjectBuilderFactory
 	private static CommandManager commandManager;
 	
 	//Audio track manager
-	AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager();
+	private static AudioPlayerManager audioPlayer = new DefaultAudioPlayerManager();
 	
 	// Localization classes - these are singletons, but should be initialized before almost all other 
 	// things so their inclusion in the factory is to ensure they're started at the correct time.
@@ -147,7 +147,8 @@ public class ObjectBuilderFactory
 			else
 			{
 				// Construct a new guild with defaults
-				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString, new AudioUtils(event.getGuild()));
+				guild = new KittyGuild(uid, new AdminControl(event.getGuild()), emotesString, 
+						new AudioUtils(event.getGuild(), audioPlayer.createPlayer()));
 				DatabaseManager.instance.globalRegister(guild);
 				guildCache.put(uid, guild);
 			}

src/network/NetworkYoutube.java

@@ -0,0 +1,14 @@
+package network;
+
+import com.google.api.services.youtube.YouTube;
+
+import offline.Ref;
+
+public class NetworkYoutube 
+{
+	private static YouTube youtube;
+	
+	public NetworkYoutube()
+	{
+	}
+}