ss
Merge branch 'master' of https://github.com/logixkjy/GoodnewsTV

Conflicts:
	GoodNewsPodcast.xcodeproj/project.pbxproj
	GoodNewsPodcast/AppDelegate.h
	GoodNewsPodcast/Base.lproj/Main.storyboard
	GoodNewsPodcast/Class/GPAudioPlayerViewController.m
	GoodNewsPodcast/Img/player_time_handle.png