Added mainline HYRISE with lastfitting branch merged

This does not have any runtime impact. The commit is diff-wise the same.