some testing with editModels
change editModels icon
editModels now has 2 modes
Slight glow on laser intersection
Coding Standard
Models.addModel now returns a more accurate modelID
More work on editModels
Revert "Models.addModel now returns a more accurate modelID"

This reverts commit 150477eea44d0438137333499fcda498072c76ea.
Merge branch 'master' of https://github.com/highfidelity/hifi into temp_branch
Removed extra debug, fix model jumping when releasing one of the two triggers.
Working on streaming script values.
Merge pull request #2993 from Atlante45/temp_branch

More editModels.js work
Merge pull request #2999 from ey6es/metavoxels

Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Added some typedefs to simplify the various mapping types.