Manually merged changes that the merge didn't do.
Changed the logo url.
Added the attributeData back into the viewModel for now. We use it for the Identify control.