sync johnnys AirServe with current master