Minicluster - merge with inverted-index

merge the 'minicluster' branch with 'inverted-index' branch to get the new data model