new gui test
merge master - resolve confict
Merge branch 'GUInew' into staging