Deleted fork to reconcile with the erroneous checkins done yesterday, re...

...created fork, copied changes , synch-ed up master, hoping this goes through
modified a bunch of namespace artifacts, metadata arifacts, added guice modules for test.