Added friend model and friend collection
Merge remote-tracking branch 'origin/master'