Merge pull request #1 from ukisami/master

Added Guice 3.0 and base classes
[bowen] fix @singleton issues