terms in progress
Merge branch 'master' into terms

Conflicts:
	accounts/templates/account/signup.html
accept_terms working
Merge branch 'master' into layout