Changed <tok> to <norm> and <word> to <norm_group> to follow new SCRIPTORIUM naming conventions
Merge branch 'version2.0_SGML_aware'