Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into development

Author: jsiegle

Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp

@@ -228,9 +228,13 @@ void ChannelMappingEditor::refreshButtonLocations()
         button->setBounds(column*width, row*height, width, height);
         totalWidth =  jmax(totalWidth, ++column*width);
 
-        if (column % 16 == 0)
+        if (column == 1)
         {
-            totalHeight =  jmax(totalHeight, ++row*height);
+            totalHeight = jmax(totalHeight, (row + 1)*height);
+        }
+        else if (column == 16)
+        {
+            row++;
             column = 0;            
         }
     }