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
CSG edit improvements.
Added frame computation and JS hooks
Removed extra space
Added passive play bar to Recorder.js
Use cubic texture coordinate generation for the dual contour surfaces.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
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
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
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
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels