Merge branch 'master' of https://github.com/Leongum/WalkFun_IOS

Conflicts:
RevolUtioN/Friends/AddFriendViewController.m
merge branch