cleaned up some spacing issues in Orientarion class
Merge remote-tracking branch 'upstream/master'
Merge pull request #241 from Ventrella/master

cleaned up some spacing issues in code formatting in Orientation class
increased GRAVITY_SCALE to 10.0;  tidied-up avatar code; moved Orientation class to shared folder
Merge pull request #242 from ZappoMan/render_voxels_optimization

Fixed some bugs, and made better scenes
temporarily disable add scene in voxel server
Merge pull request #245 from ZappoMan/master

temporarily disable add scene in voxel server
debug file loading
Merge pull request #246 from ZappoMan/master

debug server file loading
Merge pull request #247 from ZappoMan/render_voxels_optimization

Use different voxel persist files for local or server mode
Merge pull request #244 from Ventrella/master

moved Orientation class to shared folder
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization