add gui-package
Merge branch 'haakonh'
Merge remote-tracking branch 'origin/master' into haakonh