Add tables used in website index building to schema
Merge branch 'dev'