adjustments per jira ticket to content and formatting

Conflicts:
	app/views/registrations/new.html.erb
	app/views/users/terms_of_service.html.erb
Merge branch 'master' of https://github.com/benetech/ImageDescService