Merge branch 'develop'

remove superfluous doNr() register in HTML subclass
resequence master and develop