Adding avatar feature to user account
Edited user controller/view
Merge and update
Fixing bugs - merge conflicts