[FEATURE] GBI Gateway Discovery
[FIX] Fix trust.js
[FIX] Remove .row and br and fix merge conflicts
Merge pull request #1617 from mrajvanshy/gbiGatewayDiscovery

[FEATURE] GBI Gateway Discovery