privacy/tos
Merge branch 'dev'