MAJOR REFACTORING:
Merge branch 'feature_docusite' of https://github.com/lanice/hyrise into feature_docusite