add pending avatar image & update user.rb to new image name
Merge remote-tracking branch 'origin/master'