began to merge tables by hand
Merge branch 'master' of https://github.com/accefa/doku into updating