added two gateways
Removed hemera
Incerased number of gws to 10
changed email address for vpn-key
Updated URL for the map
Updated URL of Homepage
Merge branch 'beta'