Merge branch 'hotfix/undo-docs'
Merge branch 'release/2.0.0'
Merge branch 'release/2.1'
remove terms link since it 404's
Merge branch 'hotfix/footer-links' into develop