Auto stash before merge of "develop" and "master"

src/commands/poll/CommandPollMain.java

@@ -29,6 +29,6 @@ public class CommandPollMain extends Command
 	@Override
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) 
 	{
-		framework.run(guild, channel, user, input.args).Call(res);
+		framework.run(guild, channel, user, input).Call(res);
 	}
 }

src/commands/poll/SubCommandAddOption.java

@@ -7,16 +7,17 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandAddOption extends SubCommand
 {
 
-	public SubCommandAddOption(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);	}
+	public SubCommandAddOption(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);}
 
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) 
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-		return new SubCommandFormattable (guild.addChoiceToPoll(input));
+		return new SubCommandFormattable (guild.addChoiceToPoll(input.args));
 	}
 	
 }

src/commands/poll/SubCommandEnd.java

@@ -7,6 +7,7 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandEnd extends SubCommand
 {
@@ -14,7 +15,7 @@ public class SubCommandEnd extends SubCommand
 	public SubCommandEnd(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);	}
 
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) 
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
 		return new SubCommandFormattable (guild.endPoll());
 	}

src/commands/poll/SubCommandResults.java

@@ -10,7 +10,7 @@ public class SubCommandResults extends SubCommand
 	public SubCommandResults(KittyRole level, KittyRating rating) { super(level, rating); }
 	
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input)
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
 	{
 		String results = "";
 		int totalVotes = 0; 

src/commands/poll/SubCommandShow.java

@@ -8,6 +8,7 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandShow extends SubCommand
 {
@@ -15,7 +16,7 @@ public class SubCommandShow extends SubCommand
 	
 	
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input)
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
 	{
 		if(!guild.polling)
 		{

src/commands/poll/SubCommandStart.java

@@ -7,6 +7,7 @@ import dataStructures.KittyGuild;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandStart extends SubCommand
 {
@@ -14,9 +15,9 @@ public class SubCommandStart extends SubCommand
 	public SubCommandStart(KittyRole roleLevel, KittyRating contentRating) {super(roleLevel, contentRating);	}
 
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input) 
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-		return new SubCommandFormattable (guild.startPoll(input));
+		return new SubCommandFormattable (guild.startPoll(input.args));
 	}
 	
 }

src/commands/poll/SubCommandVote.java

@@ -9,13 +9,14 @@ import dataStructures.KittyPoll;
 import dataStructures.KittyRating;
 import dataStructures.KittyRole;
 import dataStructures.KittyUser;
+import dataStructures.UserInput;
 
 public class SubCommandVote extends SubCommand
 {
 	public SubCommandVote(KittyRole level, KittyRating rating) { super(level, rating); }
 	
 	@Override
-	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, String input)
+	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input)
 	{
 		if(guild.polling)
 		{
@@ -25,7 +26,7 @@ public class SubCommandVote extends SubCommand
 			}
 			try 
 			{
-				int voteNum = Integer.parseInt(input.substring(input.indexOf(" ")).trim())-1;
+				int voteNum = Integer.parseInt(input.args.substring(input.args.indexOf(" ")).trim())-1;
 				if(voteNum >= guild.choices.size() || voteNum < 0)
 				{
 					return new SubCommandFormattable (String.format(LocStrings.stub("PollVoteNotValidVote"), voteNum));