add friends model and controller
resolve friends branch
Merge pull request #2 from danarch/dm_friends

Dm friends