fixed merge conflict with master - they just both had changed cat.server_url to the local IP
fixed merge conflict with master - they just both had changed cat.server_url to the local IP

saikiran7949/MakerNode,IntelOpenDesign/MakerNode,JulianVolodia/MakerNode,saikiran7949/MakerNode,JulianVolodia/MakerNode,JulianVolodia/MakerNode,IntelOpenDesign/MakerNode,saikiran7949/MakerNode