update
Merge branch 'master' of https://github.com/KevinZhao/Daoting

Conflicts:
	Daoting/Daoting/Base.lproj/Main_iPhone.storyboard
	Daoting/Daoting/DownloadTableViewController.m
	Daoting/Daoting/SongTableViewController.m