change to logfile name (family safe), add step in merge to add androidgcs