remove conflicts
FriendController added, FriendList PartialView added, change FriendService, add migrations, change Friend Dal Model,