add window manager to ContextScope
clean up some modules that needed cleaning. Most things are (dagger) singletons in ContextScope now with only a few exceptions in application scope. No more Android Module.