temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
Merge pull request #2246 from ZappoMan/bugfixes

temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
Merge branch 'master' of https://github.com/highfidelity/hifi
Initialize scale to unity.  Closes #2232.
Merge pull request #2253 from ey6es/master

Initialize scale to unity.  Closes #2232.
remove space bar behavior from editrVoxels.js
remove qt5 homebrew formula - it lives at highfidelity/homebrew-formulas
update the BUILD guide to point to the new formula location
Merge pull request #2259 from birarda/master

remove homebrew formula to place in separate repo
Merge pull request #2258 from ZappoMan/bugfixes

remove space bar behavior from editrVoxels.js
resolve conflicts on merge with upstream master
updates to BUILD guide to suggest using tapped formulas