new changes to friendship test
Merge branch 'master' of github.com:guayang/treebook

Conflicts:
	app/controllers/user_friendships_controller.rb
	app/views/user_friendships/new.html.erb
	test/controllers/user_friendships_controller_test.rb