gwen gui now working under linux
resolved merge conflicts