Added possibility to change AudioInjector position
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording
Frame computation + timerOffset member

	When jumping inside a recording
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording
Added frame computation and JS hooks
Removed extra space
Added passive play bar to Recorder.js
Added pause behavior + change frame computation
Added pause/setCurrentTime/setCurrentFrame JShooks
Recorder.js UI + pause and slider bar implementation
Extra spaces
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording
Slider can moved when recording paused or stoped
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording
first cut at shape collisions
swith to using shape collider instead of spheres
make sphere entities use sphere shape for better collisions
Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites
make sure to scale default octree shape collision to meters
allow you to edit mass