20140304
11
Conflicts:
	TalentDemo/General/View/ActivityView.m
	TalentDemo/General/View/CoverView.h
	TalentDemo/General/View/CoverView.m
	TalentDemo/Sections/TalentCell.h
	TalentDemo/Sections/TalentCell.m
	TalentDemo/Sections/TalentViewController.m
	TalentDemo/TalentDemo-Info.plist