gui updates
Merge origin/graphplan1 into graphplan1