Fixed merge conflict
Fixed merge conflict

aleitner/storjshare-gui,Storj/storjshare-gui,Storj/driveshare-gui,Storj/storjshare-gui,Storj/driveshare-gui,Storj/driveshare-gui,aleitner/storjshare-gui,aleitner/storjshare-gui,Storj/storjshare-gui