Merge branch 'smidt' into christian
made image tranform on index
Merge branch 'christian' into smidt
Merged
Merge remote-tracking branch 'origin/smidt' into Flemming