Added name field to Gateway table & UniqueGateway custom attribute
Merge branch 'dev' into security