Merge branch 'master' of /home/ivan/thehat with conflicts.
added global dictionary edition & bootstrap