housekeeping
update show page to include concert-show-setlist in setlist
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore into merge_video_box
Merge pull request #78 from tihuan/merge_video_box

Merge video box