Merge remote-tracking branch 'origin/NySprint2' into Klim
testing changes
Merge remote-tracking branch 'origin/NySprint2' into Klim
Made changes to help Anders with loading pictograms

Not possible to load pictograms, but appropriate methods included