Merge branch 'master' of /home/korsa/workspace/phyloDB with conflicts.
Document tables removed.