merge master into branch, keep RunHeadless

software/ui/src/Generator.java

@@ -53,7 +53,7 @@ public class Generator extends LXOutput implements GeometryConstants {
     }
 
     private Color[] getRGBColors(LightSamplePoint[] points) {
-    	// consider using int[] and you have the LXColor.red()/LXColor.green()/LXColor.blue() methods
+    	// TODO consider using int[] and you have the LXColor.red()/LXColor.green()/LXColor.blue() methods
     	// which are simlar to java.awt.Color.getRed(), etc.
     	
         Color[] ledColors = new Color[points.length];