first step toward resizing avatars
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming

Conflicts:
	interface/src/Head.cpp
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
avatar resized + physic adapted
Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming
Resolve conflict
resizing avatar now handle the camera
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
added scale in avatar packets eand slots to change it from the menu
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming

Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
fixes sliced-away initialization (crashes program during shutdown when running without audio device)