Functionnal version of minecraft import
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Tags files missing in last commit
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Complete color handling in minecraft import
Final code for minecraft import to review
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Incorporating comments for code review (minecraft import)
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Merge branch 'master' of git://github.com/worklist/hifi into 19373
Linked ZLIB to voxels library
merge conflict
Merge pull request #630 from Atlante45/19373

Code Review for Job #19373