fixed invalid define guard
editVoxels - importing voxels
Merge branch 'master' of https://github.com/worklist/hifi into editVoxels
code style
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
More work on editVoxel.js
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Added preview deplacement + fixed locking issue
Fixed spaces added everywhere
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Added importBoundaries
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Moved Avatar upload to file Menu
FstReader not a member anymore
Added the send method