fix linux build for missing getpid()
move sitting points back to a contained element to fix the crash Ryan was seeing
Merge pull request #3687 from ZappoMan/fixSittingPointsCrash

move sitting points back to a contained element to fix the crash Ryan was seeing
Merge pull request #3686 from AndrewMeadows/inertia

fix linux build for missing getpid()
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
removing inline keyword and typo