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
Fixed review comments
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels

Conflicts:
	interface/interface_en.ts
Changed lockForWrite() to lockForRead()
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels

Conflicts:
	interface/interface_en.ts