Some visual changes
Resolve conflicts
Fix problem with default picture of user in peopleSearch
Fix problem with default avatar of user in PeopleSearch