Merge pull request #480 from dpadgett/svdemo

pass 1 on serverside demo recording.