added new show details code
converted show details view to scrollview
added json string to parse model
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ShowDetailsViewController.m