Added gateways to uav_api. Small fixes