Merge branch 'master' of git://github.com/ZdenekM/srs_public
corrected object locations for objects on white_shelf
Merge branch 'master' of git://github.com/mxcreator/srs_public