Removed resolve tool window since it is not used.
Moved tool window factory into tool window class.
Buildserver auto merge