better imgs
commit for merging
Merge remote-tracking branch 'upstream/master'
some fixes in zhangs
some fixes in irina
correction in irina, scene5
Merge branch 'brassy--master'