fixed CombineFeatures, added CombineDense
Merge branch 'master' of https://github.com/charlesdguthrie/frontrow