Adds name field to user editor
Merge remote-tracking branch 'origin/master' into profile_editor_edits

Conflicts:
	db/schema.rb
Merge pull request #48 from alindeman/profile_editor_edits

Adds name field to user editor