new db and migration history
fixing database, added websites
Merge branch 'dbcleanup'

* dbcleanup:
  fixing database, added websites
  new db and migration history

ially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.