final friend fix.. i hope
Merge branch 'master' into friends

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_current_user_profile.html.erb
	app/views/users/show.html.erb
Merge branch 'friends'