[Diana][Andreea] show initial world
Merge remote-tracking branch 'origin/master'