includes all changes from Jour-Fixe 2015-08-14, almost ready for prod…

…uction, still needs some spell checking and such.

includes all changes from Jour-Fixe 2016-08-11

original