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
Merge pull request #20 from ios-class/linkai_search

Linkai search
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
Finished favorite
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from xiatao123/master

finished fav
Fix load fav issue
Merge pull request #23 from xiatao123/master

Fix load fav issue
Load favorite from Parse every time
Merge pull request #24 from xiatao123/master

Load favorite from Parse every time
Added fav button
switch to popular show when fav is empty
Merge pull request #25 from xiatao123/master

Added fav button
add left swipe