Fix rebase errors

desktop/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     compile 'de.jensd:fontawesomefx-materialdesignfont:2.0.26-9.1.2'
     compile 'com.googlecode.jcsv:jcsv:1.4.0'
     compile 'com.github.sarxos:webcam-capture:0.3.12'
-
+    compile 'com.jfoenix:jfoenix:8.0.7'
 
     compileOnly 'org.projectlombok:lombok:1.18.2'
     annotationProcessor 'org.projectlombok:lombok:1.18.2'

desktop/src/main/java/bisq/desktop/components/JFXRadioButtonSkinBisqStyle.java

@@ -54,7 +54,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin {
     public JFXRadioButtonSkinBisqStyle(JFXRadioButton control) {
         super(control);
 
-        final double radioRadius = 8;
+        final double radioRadius = 7;
         radio = new Circle(radioRadius);
         radio.getStyleClass().setAll("radio");
         radio.setStrokeWidth(1);
@@ -200,7 +200,7 @@ public class JFXRadioButtonSkinBisqStyle extends RadioButtonSkin {
         final double labelHeight = Math.min(radioButton.prefHeight(labelWidth), h);
         final double maxHeight = Math.max(contHeight, labelHeight);
         final double xOffset = computeXOffset(w, labelWidth + contWidth, radioButton.getAlignment().getHpos()) + x;
-        final double yOffset = computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + x;
+        final double yOffset = computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + x + 5;
 
         layoutLabelInArea(xOffset + contWidth + padding/3, yOffset, labelWidth, maxHeight, radioButton.getAlignment());
         ((Text) getChildren().get((getChildren().get(0) instanceof Text) ? 0 : 1)).