Working on Avatar default
Fixed gravatar default image to use their default if on localhost
Working on avatar handling in inbox
fixing merge conflict