Merge branch 'rmXXXXbyYYYY' into develop

Author: UltimatePea

src/settings/Defaults.java

@@ -3,7 +3,6 @@
 import java.awt.Color;
 
 public class Defaults {
-  //sample change to Defaults
 
 	private static final Color SELECT_TOOL_ICON_COLOR = Color.BLACK;