Merging light branch back to master
Created by: bolmsten
As agreed we should not have two branches instead the build script will remove the samplegrid menu icon for now.
This PR contains the changes made for the GUI but also changes we have made while testing the light branch. It has therefore grown and become quite big, this is something that we wanted to avoid but unfortunately the fixes down to move forward here has created this.