Merge branch 'feature/change_alias_and_name_61' into develop
Merge branch 'feature/change_edit' into develop
Adding page for redacting profile
Merge branch 'feature/user_redact_41' into staging

Conflicts:
	app/models/user.rb