added changes
Merge branch 'master' of https://github.com/snambi/inject-test

Conflicts:
	guice/src/main/java/org/github/guice/GuiceBootstrap.java