branch editace to master