Changed avatar resizing shortcuts to plus and minus.
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
merge
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
Changed shifted and meta variable name
Fixed fucked up merge
Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event
Merge pull request #764 from Atlante45/fix_key_press_event

Fix key press event
Merge remote-tracking branch 'upstream/master'
Fix bug where the lookatIndicator would draw and no longer update.