Merge pull request #1645 from ZappoMan/bugfixes

fix particle-server spinning out at 100% cpu
fix crashing particle server bug
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes