Squashed 'guice/' changes from 0c3d6ab..4bd04c7

4bd04c7 Fix compile errors
05c56a9 New deisgn clean up
9a0e6ed New extension points for blender. Allow subclasses to extend template.
42cdaae Solves issue https://github.com/roboguice/roboguice/issues/261
REVERT: 0c3d6ab Fix compile errors
REVERT: 1894503 New deisgn clean up
REVERT: db68499 New extension points for blender. Allow subclasses to extend template.

git-subtree-dir: guice
git-subtree-split: 4bd04c70c001041491b333a3b8a61da9e9264cb6
Update of Guice fork to continue 3.1 dev. Guice fork commit : 4bd04c70c001041491b333a3b8a61da9e9264cb6
Merge commit 'caad953ee9d907b38af852b0ad9d9666b4d82cbc'