Change bg color and add border
Merge remote-tracking branch 'upstream/master'
Add border in navigation bar
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ShowDetailsViewController.m
Add load favorite
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Pods/Pods.xcodeproj/project.pbxproj
	ShowDetailsViewController.m
	showsApp.xcodeproj/project.pbxproj
Merge pull request #21 from xiatao123/master

ui update and favorite