Merge: rev823 (terms of service and privacy links hooked up)