corrected terms and conditions
Merge branch 'dev'

corrected terms and conditions