fixing path for sshots generator
osd position changes
osd position changes
Merge remote-tracking branch 'origin/master'