fixed sql in network.load, fixed parseGates, started custom gates
fixed merge conflicts