Fixing issue 2

Changed <topic-type-order> to take nested <topic-type> elements instead
of a CSV list. Also did the same for <topic-set-type-order> with nested
<topic-set-type> elements.