added code to detect mouse hovering over avatar joints for various touch effects
Merge remote-tracking branch 'upstream/master'
cleaned up some code spacing
created transitions between camera modes
Merge remote-tracking branch 'upstream/master'
Merge pull request #297 from Ventrella/master

added code to allow mouse hover over avatar to be used for touch effects
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/main.cpp