fixes to data merge
Merge branch 'master' of https://github.com/charlesdguthrie/frontrow