Fixed typo
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
Add setting save/load to grid tool
Update edit entities to disable on wasd or arrow keys
Remove print statement
fix to crash on rapidly switching domains
guard against NULL _models
spacing
wrong pickray function
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
remove debug ryans rotate problem
Merge pull request #3930 from ZappoMan/crashOnSwitch

fix to crash on rapidly switching domains
Merge pull request #3931 from Atlante45/mouse_pick_in_oculus

Misc fixes
Merge pull request #3932 from ZappoMan/cleanupMenus

remove debug ryans rotate problem
Merge pull request #3928 from huffman/entity-tool-settings

Entity tool settings
Merge branch 'master' of https://github.com/highfidelity/hifi