Merge branch 'tos' into iliketoast

Conflicts:
	.gitignore
Terms of service and privacy policy feature.
If enabled, terms of service link will be shown in sign up page.
Merge branch 'tos' into iliketoast

Conflicts:
	.gitignore