Feature/side nav avatar merge first #92

Closed mtinner closed 7 years ago