Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code
fix for DataWebPage hifi link handling
Tweaks to heightfield conversion.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Audio-only mouth uses multiple blend shapes
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
clarify fake blendshape array size
Added options to selectively toggle heightfield/dual contour surface
rendering.
Fix for clearing empty nodes.
Fix player loop
FIxing the merge
Improve comment regarding the replacement of the QGLProgram->bind()
More gradual improvements to heightfield voxelization.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge pull request #3642 from samcake/temp0

Bring back the GL batching for model rendering and fixed the bug on MAC
Merge pull request #3657 from ey6es/metavoxels

Further incremental improvements to heightfield voxelization.
Merge pull request #3644 from birarda/data-web-page

fix for DataWeb hifi link handling
Merge pull request #3651 from PhilipRosedale/master

Better animation for audio-only mouth movement
Merge pull request #3655 from Atlante45/fix_playback_loop

Fix player loop
bubble up ATL_INCLUDE_DIRS from FindATL module