Merge branch 'develop'
removed several comments that were no longer refered.
Changed offsets of elephant, fawn, mazak bird.
Merge branch 'release/4.1'
Merge branch 'master' into develop