Starting on Visage support.
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
Starting on Visage integration.
We need the dependencies, too.
More build settings.
Missed a spot.
Sniffing glue, wrong day, etc.
Fixes for Windows.  Compiles, but the license doesn't work yet.
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
Added Visage stuff to .gitignore.
Simplifiy API for camera mode transitions

Specify the "period" for the transition rather than the "rate".
Remove cruft: old avatar-avatar collision option
Split render options for head/body collision proxy

This makes the poor proxy shapes easier to see.
fix the sometime voxels don't show when you move bug
Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion

Conflicts:
	interface/src/Menu.h
	interface/src/avatar/Avatar.cpp
Merge branch 'master' of https://github.com/worklist/hifi into voxelnotshownbug
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
Attempting to get Visage building in on OS X.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion