add privacy and terms to the settings page (bug 1049952)
Merge pull request #711 from andymckay/1049952

add terms and privacy to the settings page