Cleaned up sqlite db, dropping unused tables and columns, fixing columns that had lost their definitions.
fixed database definition problems (re. referencing fields); updated db from live site
merged with remote (primarily submodule updates)