more work on camera shifting between modes
Merge remote-tracking branch 'upstream/master'
working on lookat (eye contact)
Merge remote-tracking branch 'upstream/master'
more work on avatar lookat
puts private members to the bottom of the class definition
adds comments and blank lines to clarify the code
Merge branch 'master' of https://github.com/worklist/hifi
cleaned up copyright header notifications in several files
turned off look at behavior - until it is finished and working correctly
thingy
Merge branch 'master' of https://github.com/worklist/hifi
Slight fix for shadows; we were drawing an unnecessary layer of text.
Merge branch 'master' of https://github.com/worklist/hifi
cleaned up head class - made most members private. Added copy constructor
resolved conflicts
Merge branch 'master' of git://github.com/worklist/hifi into 19165

Conflicts:
	interface/src/Oscilloscope.cpp
cleanup
trying to fix merge conflicts
formatting changes