Merge branch 'fiilings' of git@code.electrolab.fr:openEmbroidery/openEmbroidery_software.git into fiilings # Conflicts: # include/OE_display.h # src/OE_interfaceDisplay.cpp
