refactor code
Merge branch 'gxt3-sandbox' into strootman-dev