added second gateway
Merge branch 'master' into ffbs-master