removed silly error on norms
en
Merge branch 'master' of https://github.com/coinvent/coinvent

trying to push a new version of complexes.dol - I suspect conflicts with original