Added image field to Friends model
Merge remote-tracking branch 'origin/master'