Merge branch 'master' into dev

code/html/index.html

@@ -226,7 +226,7 @@
                                 <div id="relays">
                                 </div>
 
-                                <div class="pure-g">
+                                <div class="pure-g module module-color">
                                     <label class="pure-u-1 pure-u-sm-1-4">Color</label>
                                     <input class="pure-u-1 pure-u-sm-1-4" data-wcp-layout="block" name="color" readonly />
                                 </div>