remove conflicts
FriendController added, FriendList PartialView added, change FriendService, add migrations, change Friend Dal Model,
Merge pull request #8 from MihailMartinovich/master

FriendController added, FriendList PartialView added and other