put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
Merge remote-tracking branch 'upstream/master'
fixed merge conflict
Merge pull request #252 from Ventrella/master

moved orientation back to avatar (let's review the overall architecture of 'shared' things at some point)