Resolved merge conflict

src/main/java/fucoin/MainRemote.java

src/main/java/fucoin/gui/WalletGuiControl.java

src/main/java/fucoin/gui/WalletGuiControlImpl.java

src/main/java/fucoin/setup/NetworkInterfaceReader.java

src/main/java/fucoin/setup/SelectableNetworkInterface.java

src/main/java/fucoin/setup/SetupDialogPanel.java

src/main/java/fucoin/wallet/WalletImpl.java