Implement links in Terms and Conditions
Merge remote-tracking branch 'origin/master'