Added code to allow Guice users to bind a DatabaseIdProvider
Fixing imports to reduce merge
Back to snapshot (previous revision)