Changed nav bar avatar from referencing field_avatar to user_picture
Changed uf_edit to reference user_picture instead of field_avatar for users
Removed field_avatar from uf_content_types
Changed reference in user profile from field_avatar to user_picture#markup
Removed another field_avatar reference in uf_edit and fixed indenting