Field updates
Removed repetitive code
Merge branch 'master' into bootstrap

Conflicts:
	app/views/users/show.html.erb
Merge branch 'bootstrap'
Merged with bootstrap