6.20
1.重新布局活动详情页面
2.建立documents/media/文件夹 存储图片、视频 （文件路径与云上对应）
3.添加与百度云交互的方法（上传，下载）（需要后台提供url）
Merge branch 'dev-2'

Conflicts:
	Metic.xcodeproj/project.pbxproj
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang5.xcuserdatad/UserInterfaceState.xcuserstate
	Metic.xcodeproj/project.xcworkspace/xcuserdata/ligang_mac4.xcuserdatad/UserInterfaceState.xcuserstate
	Metic.xcodeproj/xcuserdata/ligang_mac4.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	Metic/Base.lproj/Main_iPhone.storyboard
	Metic/Main Classes/AddFriendViewController.m
	Metic/Main Classes/EventDetailViewController.m
	Metic/Main Classes/FriendsViewController.h
	Metic/Main Classes/FriendsViewController.m
	Metic/Main Classes/HomeViewController.m
	Metic/Main Classes/MTUser.m
	Metic/Main Classes/MenuViewController.m
	Metic/Main Classes/SearchedFriendTableViewCell.h
	Metic/Utils/CommonUtils.h
	Metic/Utils/CommonUtils.m
	Metic/Utils/HttpSender.m