Merge branch 'master' into dev

Conflicts:
	sigIRCv2.jar

src/sig/Module.java

@@ -149,7 +149,7 @@ public class Module {
 	}
 	
 	private Rectangle2D getDrawBounds() {
-		Rectangle2D drawBounds = new Rectangle((int)position.getX(),(int)position.getY()-titleHeight+3,(int)position.getWidth(),(int)position.getHeight()+titleHeight);
+		Rectangle2D drawBounds = new Rectangle((int)position.getX()-2,(int)position.getY()-titleHeight+3-1,(int)position.getWidth()+2,(int)position.getHeight()+titleHeight+1);
 		return drawBounds;
 	}
 	

src/sig/ScrollingText.java

@@ -118,7 +118,7 @@ public class ScrollingText {
 
 	private void LogMessageToFile(String message) {
 		Calendar cal = Calendar.getInstance();
-		FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt");
+		FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt",true);
 	}
 
 	private Color GetUserNameColor(String username) {

src/sig/modules/TwitchModule.java

@@ -414,7 +414,7 @@ public class TwitchModule extends Module{
 
 	private void LogMessageToFile(String message) {
 		Calendar cal = Calendar.getInstance();
-		FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt");
+		FileUtils.logToFile(message, sigIRC.BASEDIR+"sigIRC/logs/log_"+(cal.get(Calendar.MONTH)+1)+"_"+cal.get(Calendar.DAY_OF_MONTH)+"_"+cal.get(Calendar.YEAR)+".txt",true);
 	}
 
 	public void draw(Graphics g){

src/sig/utils/FileUtils.java

@@ -236,6 +236,10 @@ public class FileUtils {
 	  }
 	  
 	  public static void logToFile(String message, String filename) {
+		 logToFile(message,filename,false);  
+	  }
+	  
+	  public static void logToFile(String message, String filename, boolean outputToChatLog) {
 		  File file = new File(filename);
 			try {
 
@@ -252,7 +256,9 @@ public class FileUtils {
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
-			ChatLogMessage.importMessages(message);
+			if (outputToChatLog) {
+				ChatLogMessage.importMessages(message);
+			}
 		}
 	  
 	  public static void writetoFile(String[] data, String filename) {