Squashed 'guice/' changes from f856e4e..ab34526

ab34526 Offical Blender Guice fork
REVERT: f856e4e Merge branch 'snicolas-mburton-blender-merge' into snicolas-mburton-blender-after-merge

git-subtree-dir: guice
git-subtree-split: ab34526cb2bce21454b20018dbfbd88136a5fe11
Blender fork of guice merged into RoboGuice. With Mike comments