Merge branch 'master' of https://github.com/worklist/hifi
Fix for starfield rendering on Oculus: put inter-pupil translation in
modelview matrix where it belongs, don't reset perspective projection for
starfield.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/Application.cpp
Removed unused nearCenter/farCenter from ViewFrustum.
tune the distance attenuation on audio-mixer
Merge pull request #412 from birarda/master

tune the distance attenuation
Merge branch 'master' of https://github.com/worklist/hifi
Disable voxel textures by default.
Hide the cursor when in fullscreen Oculus mode.
new bug parts and colors
Merge pull request #413 from ZappoMan/voxel_animation

new bug parts and colors
added avatar hair
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/worklist/hifi
Added the avatar mohawk
make dragonfly move in circle instead of line
Merge branch 'master' of https://github.com/worklist/hifi
Fixes per review
Merge pull request #414 from PhilipRosedale/master

Added the mighty mohawk
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation