some ednotes
Merge branch 'master' of github.com:tillmo/DOL
ednotes and new terms according to Tara's comments