A whole bunch of changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/user.rb
	app/views/users/show.html.erb