Feature/fix vocabulary
The branch aims at making clear the relationships between the syntactic constructs in stOTTR and the corresponding concepts in mOTTR and rOTTR.
It also contains other harmonizing changes, in particular to the name and structure (but not the meaning, i.e. allowed syntactic constructs) of some of the grammar elements.