No reason to change that...
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
More debugging of the FBXReader in order to understand how to interpret the material fields
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
hack a separate emissive information in the g-buffer
hack a separate emissive information in the g-buffer
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
don't exit app in full screen or hdm mode
remove Entities developer menu items from C++ menu, make them available through script
switch to single button for mode switching
1P mirror can lean fwd/back
Merge branch 'master' of https://github.com/worklist/hifi
more HMD Tools improvements, better support for detecting adding/removing screens
Merge pull request #3871 from ZappoMan/HMDMode

Various HMD Tools improvements
Merge branch 'master' of https://github.com/worklist/hifi
fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why
Merge pull request #3873 from samcake/tot

Fix lighmaps for VC demo 12/1/2014
Fix Hydra cursors in VR display

They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
Merge pull request #3874 from ctrlaltdavid/fix-hydra-vr-cursors

Fix Hydra cursors in VR display
fixes the stutter in animation when observer moves