updates
Merge branch 'feature/terms'
Merge branch 'master' into feature/terms