ADT & WSP

everything
Merge branch 'master' into gh-pages