fixed layer dragging issues
Merge branch 'master' into HaiBranch
switching over to master