Couple of small improvements

1. NUllPointer in SiteAssemblerImpl.java
2. CMSMainWindow.java improves to have the correct value as the logout url.Earlier there was bug as the url was the incorrect one.