save
Merge branch 'master' into dr2

Conflicts:
	Wilson/WILFeedViewController.m
show audio player in feed.
Merge branch 'master' into dr2
Merge branch 'dr2'

Conflicts:
	Wilson/WILFeedViewController.m
dismiss button
Merge branch 'master' into sean

Conflicts:
	Wilson.xcodeproj/project.pbxproj