Fixed things, for some reason files were changed in the gui package...
Merge branch 'master' of github.com:ErikBjare/XL