Merge branch 'devlop' into feature/bird1204
using cocoapods
Merge branch 'feature/bird1204' into devlop
改用JSONKIT

delete JSON
move viewController to addFriendView/viewController
清高的程式
Merge branch 'feature/bird1204' into devlop
ddd
Merge branch 'feature/bird1204' into devlop
Merge branch 'devlop' into feature/leo2991