Added VoxelImporter class
Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview
Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview
Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview
More work on import interface
Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview
Added ImportDialog.*
merge
Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Dialogbox for import fully functionnal
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Add blur scale uniform.
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Optimizations for occlusion blur (the main one being that we only need to
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Cleanup.
More cleanup.
switch OS X base SDK to 10.7
Merge pull request #872 from ey6es/ssao

Performance improvement for the SSAO blur step, cleanup.