fixed object z-index bug
Merge branch 'develop'
Hotfix