Merge pull request #3751 from ZappoMan/entityBugs

various entity bug fixes
Merge branch 'master' of https://github.com/highfidelity/hifi into entityBugs